diff --git a/app/assets/images/Adobe_PDF_file_icon_32x32.png b/app/assets/images/Adobe_PDF_file_icon_32x32.png
index c24f66c04..b8037de23 100644
Binary files a/app/assets/images/Adobe_PDF_file_icon_32x32.png and b/app/assets/images/Adobe_PDF_file_icon_32x32.png differ
diff --git a/app/assets/images/achievements/achievement_background.png b/app/assets/images/achievements/achievement_background.png
index c74ff1bf2..69bfad33b 100644
Binary files a/app/assets/images/achievements/achievement_background.png and b/app/assets/images/achievements/achievement_background.png differ
diff --git a/app/assets/images/achievements/achievement_background_light.png b/app/assets/images/achievements/achievement_background_light.png
index 53e09e62d..685d763cb 100644
Binary files a/app/assets/images/achievements/achievement_background_light.png and b/app/assets/images/achievements/achievement_background_light.png differ
diff --git a/app/assets/images/achievements/achievement_background_locked.png b/app/assets/images/achievements/achievement_background_locked.png
index 94a300b12..5af8bf3d7 100644
Binary files a/app/assets/images/achievements/achievement_background_locked.png and b/app/assets/images/achievements/achievement_background_locked.png differ
diff --git a/app/assets/images/achievements/bar_border.png b/app/assets/images/achievements/bar_border.png
index 9ad03ef20..8d1997e5e 100644
Binary files a/app/assets/images/achievements/bar_border.png and b/app/assets/images/achievements/bar_border.png differ
diff --git a/app/assets/images/achievements/border_diamond.png b/app/assets/images/achievements/border_diamond.png
index a2e10f8f0..80d56674b 100644
Binary files a/app/assets/images/achievements/border_diamond.png and b/app/assets/images/achievements/border_diamond.png differ
diff --git a/app/assets/images/achievements/border_diamond_locked.png b/app/assets/images/achievements/border_diamond_locked.png
index bc56fbc75..47aadf5ac 100644
Binary files a/app/assets/images/achievements/border_diamond_locked.png and b/app/assets/images/achievements/border_diamond_locked.png differ
diff --git a/app/assets/images/achievements/border_gold.png b/app/assets/images/achievements/border_gold.png
index 7a46157c1..b60af78da 100644
Binary files a/app/assets/images/achievements/border_gold.png and b/app/assets/images/achievements/border_gold.png differ
diff --git a/app/assets/images/achievements/border_gold_locked.png b/app/assets/images/achievements/border_gold_locked.png
index f1ee95e3d..3a07cf0b2 100644
Binary files a/app/assets/images/achievements/border_gold_locked.png and b/app/assets/images/achievements/border_gold_locked.png differ
diff --git a/app/assets/images/achievements/border_silver.png b/app/assets/images/achievements/border_silver.png
index 016d48b00..17fe84230 100644
Binary files a/app/assets/images/achievements/border_silver.png and b/app/assets/images/achievements/border_silver.png differ
diff --git a/app/assets/images/achievements/border_silver_locked.png b/app/assets/images/achievements/border_silver_locked.png
index 44bcc7e84..e1885b8f1 100644
Binary files a/app/assets/images/achievements/border_silver_locked.png and b/app/assets/images/achievements/border_silver_locked.png differ
diff --git a/app/assets/images/achievements/border_stone.png b/app/assets/images/achievements/border_stone.png
index 7d13718ce..8e216f529 100644
Binary files a/app/assets/images/achievements/border_stone.png and b/app/assets/images/achievements/border_stone.png differ
diff --git a/app/assets/images/achievements/border_stone_locked.png b/app/assets/images/achievements/border_stone_locked.png
index 66f92b2b4..4ce368aca 100644
Binary files a/app/assets/images/achievements/border_stone_locked.png and b/app/assets/images/achievements/border_stone_locked.png differ
diff --git a/app/assets/images/achievements/border_wood.png b/app/assets/images/achievements/border_wood.png
index 368878c20..67eb09390 100644
Binary files a/app/assets/images/achievements/border_wood.png and b/app/assets/images/achievements/border_wood.png differ
diff --git a/app/assets/images/achievements/border_wood_locked.png b/app/assets/images/achievements/border_wood_locked.png
index 167e87421..216d7e40a 100644
Binary files a/app/assets/images/achievements/border_wood_locked.png and b/app/assets/images/achievements/border_wood_locked.png differ
diff --git a/app/assets/images/achievements/cross-01.png b/app/assets/images/achievements/cross-01.png
index 6a2ab02ef..6090d9ae0 100644
Binary files a/app/assets/images/achievements/cross-01.png and b/app/assets/images/achievements/cross-01.png differ
diff --git a/app/assets/images/achievements/cup-01.png b/app/assets/images/achievements/cup-01.png
index 3b4c4c40b..b3ffa884e 100644
Binary files a/app/assets/images/achievements/cup-01.png and b/app/assets/images/achievements/cup-01.png differ
diff --git a/app/assets/images/achievements/cup-02.png b/app/assets/images/achievements/cup-02.png
index 0eba69463..680c1159b 100644
Binary files a/app/assets/images/achievements/cup-02.png and b/app/assets/images/achievements/cup-02.png differ
diff --git a/app/assets/images/achievements/default.png b/app/assets/images/achievements/default.png
index adc2d5be4..0ccd6ccb0 100644
Binary files a/app/assets/images/achievements/default.png and b/app/assets/images/achievements/default.png differ
diff --git a/app/assets/images/achievements/level-bg.png b/app/assets/images/achievements/level-bg.png
index 9a23c0a6b..76173054e 100644
Binary files a/app/assets/images/achievements/level-bg.png and b/app/assets/images/achievements/level-bg.png differ
diff --git a/app/assets/images/achievements/message-01.png b/app/assets/images/achievements/message-01.png
index 8fe3dac44..f067440a5 100644
Binary files a/app/assets/images/achievements/message-01.png and b/app/assets/images/achievements/message-01.png differ
diff --git a/app/assets/images/achievements/patch-01.png b/app/assets/images/achievements/patch-01.png
index dba898f40..a55d50c57 100644
Binary files a/app/assets/images/achievements/patch-01.png and b/app/assets/images/achievements/patch-01.png differ
diff --git a/app/assets/images/achievements/pendant-01.png b/app/assets/images/achievements/pendant-01.png
index 0d0b8fc00..c143737b6 100644
Binary files a/app/assets/images/achievements/pendant-01.png and b/app/assets/images/achievements/pendant-01.png differ
diff --git a/app/assets/images/achievements/scroll-01.png b/app/assets/images/achievements/scroll-01.png
index a7ab56721..95995007a 100644
Binary files a/app/assets/images/achievements/scroll-01.png and b/app/assets/images/achievements/scroll-01.png differ
diff --git a/app/assets/images/achievements/star.png b/app/assets/images/achievements/star.png
index 22f86961d..d9a8acfbc 100644
Binary files a/app/assets/images/achievements/star.png and b/app/assets/images/achievements/star.png differ
diff --git a/app/assets/images/achievements/swords-01.png b/app/assets/images/achievements/swords-01.png
index 3d7b5170d..bc86de54a 100644
Binary files a/app/assets/images/achievements/swords-01.png and b/app/assets/images/achievements/swords-01.png differ
diff --git a/app/assets/images/common/button-background-active-border.png b/app/assets/images/common/button-background-active-border.png
index 42dec5b5a..bc9d8e7ab 100644
Binary files a/app/assets/images/common/button-background-active-border.png and b/app/assets/images/common/button-background-active-border.png differ
diff --git a/app/assets/images/common/button-background-active.png b/app/assets/images/common/button-background-active.png
index aae72bb00..ca6757724 100644
Binary files a/app/assets/images/common/button-background-active.png and b/app/assets/images/common/button-background-active.png differ
diff --git a/app/assets/images/common/button-background-danger-active-border.png b/app/assets/images/common/button-background-danger-active-border.png
index 30ed218dd..41f69383a 100644
Binary files a/app/assets/images/common/button-background-danger-active-border.png and b/app/assets/images/common/button-background-danger-active-border.png differ
diff --git a/app/assets/images/common/button-background-danger-active.png b/app/assets/images/common/button-background-danger-active.png
index b198ed621..f34da444c 100644
Binary files a/app/assets/images/common/button-background-danger-active.png and b/app/assets/images/common/button-background-danger-active.png differ
diff --git a/app/assets/images/common/button-background-danger-disabled-border.png b/app/assets/images/common/button-background-danger-disabled-border.png
index eabd86d3f..3a3c1f934 100644
Binary files a/app/assets/images/common/button-background-danger-disabled-border.png and b/app/assets/images/common/button-background-danger-disabled-border.png differ
diff --git a/app/assets/images/common/button-background-danger-disabled.png b/app/assets/images/common/button-background-danger-disabled.png
index 494f85869..bc979e335 100644
Binary files a/app/assets/images/common/button-background-danger-disabled.png and b/app/assets/images/common/button-background-danger-disabled.png differ
diff --git a/app/assets/images/common/button-background-danger-pressed-border.png b/app/assets/images/common/button-background-danger-pressed-border.png
index eadb03397..df027ad3d 100644
Binary files a/app/assets/images/common/button-background-danger-pressed-border.png and b/app/assets/images/common/button-background-danger-pressed-border.png differ
diff --git a/app/assets/images/common/button-background-danger-pressed.png b/app/assets/images/common/button-background-danger-pressed.png
index 2438ad3ee..0a989cd02 100644
Binary files a/app/assets/images/common/button-background-danger-pressed.png and b/app/assets/images/common/button-background-danger-pressed.png differ
diff --git a/app/assets/images/common/button-background-disabled-border.png b/app/assets/images/common/button-background-disabled-border.png
index dbbe537cc..3b0e0709f 100644
Binary files a/app/assets/images/common/button-background-disabled-border.png and b/app/assets/images/common/button-background-disabled-border.png differ
diff --git a/app/assets/images/common/button-background-disabled.png b/app/assets/images/common/button-background-disabled.png
index 78fae8539..d2459735e 100644
Binary files a/app/assets/images/common/button-background-disabled.png and b/app/assets/images/common/button-background-disabled.png differ
diff --git a/app/assets/images/common/button-background-pressed-border.png b/app/assets/images/common/button-background-pressed-border.png
index d9c173d64..55cbba14b 100644
Binary files a/app/assets/images/common/button-background-pressed-border.png and b/app/assets/images/common/button-background-pressed-border.png differ
diff --git a/app/assets/images/common/button-background-pressed.png b/app/assets/images/common/button-background-pressed.png
index b1433c3ff..d7a3c9d9c 100644
Binary files a/app/assets/images/common/button-background-pressed.png and b/app/assets/images/common/button-background-pressed.png differ
diff --git a/app/assets/images/common/button-background-primary-active-border.png b/app/assets/images/common/button-background-primary-active-border.png
index 140858b50..b5a1451c8 100644
Binary files a/app/assets/images/common/button-background-primary-active-border.png and b/app/assets/images/common/button-background-primary-active-border.png differ
diff --git a/app/assets/images/common/button-background-primary-active.png b/app/assets/images/common/button-background-primary-active.png
index 7e054911c..6dc209141 100644
Binary files a/app/assets/images/common/button-background-primary-active.png and b/app/assets/images/common/button-background-primary-active.png differ
diff --git a/app/assets/images/common/button-background-primary-disabled-border.png b/app/assets/images/common/button-background-primary-disabled-border.png
index b3a0fedcf..98392fc1a 100644
Binary files a/app/assets/images/common/button-background-primary-disabled-border.png and b/app/assets/images/common/button-background-primary-disabled-border.png differ
diff --git a/app/assets/images/common/button-background-primary-disabled.png b/app/assets/images/common/button-background-primary-disabled.png
index adb402464..53e11c2c2 100644
Binary files a/app/assets/images/common/button-background-primary-disabled.png and b/app/assets/images/common/button-background-primary-disabled.png differ
diff --git a/app/assets/images/common/button-background-primary-pressed-border.png b/app/assets/images/common/button-background-primary-pressed-border.png
index 2cb8f9059..48413e6a7 100644
Binary files a/app/assets/images/common/button-background-primary-pressed-border.png and b/app/assets/images/common/button-background-primary-pressed-border.png differ
diff --git a/app/assets/images/common/button-background-primary-pressed.png b/app/assets/images/common/button-background-primary-pressed.png
index cc7ab716a..b26df6dbd 100644
Binary files a/app/assets/images/common/button-background-primary-pressed.png and b/app/assets/images/common/button-background-primary-pressed.png differ
diff --git a/app/assets/images/common/button-background-success-active-border.png b/app/assets/images/common/button-background-success-active-border.png
index b64df9e49..df198bb1d 100644
Binary files a/app/assets/images/common/button-background-success-active-border.png and b/app/assets/images/common/button-background-success-active-border.png differ
diff --git a/app/assets/images/common/button-background-success-active.png b/app/assets/images/common/button-background-success-active.png
index bb6850e8b..8a41992ee 100644
Binary files a/app/assets/images/common/button-background-success-active.png and b/app/assets/images/common/button-background-success-active.png differ
diff --git a/app/assets/images/common/button-background-success-inactive-border.png b/app/assets/images/common/button-background-success-inactive-border.png
index cf1dfc217..e59a83470 100644
Binary files a/app/assets/images/common/button-background-success-inactive-border.png and b/app/assets/images/common/button-background-success-inactive-border.png differ
diff --git a/app/assets/images/common/button-background-success-inactive.png b/app/assets/images/common/button-background-success-inactive.png
index 0e02036c2..1fd16f038 100644
Binary files a/app/assets/images/common/button-background-success-inactive.png and b/app/assets/images/common/button-background-success-inactive.png differ
diff --git a/app/assets/images/common/button-background-success-pressed-border.png b/app/assets/images/common/button-background-success-pressed-border.png
index c12979058..9d2a01989 100644
Binary files a/app/assets/images/common/button-background-success-pressed-border.png and b/app/assets/images/common/button-background-success-pressed-border.png differ
diff --git a/app/assets/images/common/button-background-success-pressed.png b/app/assets/images/common/button-background-success-pressed.png
index 41c23a01f..6a5c3ae62 100644
Binary files a/app/assets/images/common/button-background-success-pressed.png and b/app/assets/images/common/button-background-success-pressed.png differ
diff --git a/app/assets/images/common/button-background-warning-active-border.png b/app/assets/images/common/button-background-warning-active-border.png
index 8a666e47b..01d099b12 100644
Binary files a/app/assets/images/common/button-background-warning-active-border.png and b/app/assets/images/common/button-background-warning-active-border.png differ
diff --git a/app/assets/images/common/button-background-warning-active.png b/app/assets/images/common/button-background-warning-active.png
index eeff76f4f..357458cd1 100644
Binary files a/app/assets/images/common/button-background-warning-active.png and b/app/assets/images/common/button-background-warning-active.png differ
diff --git a/app/assets/images/common/button-background-warning-disabled-border.png b/app/assets/images/common/button-background-warning-disabled-border.png
index 62f12be18..f22d6ec54 100644
Binary files a/app/assets/images/common/button-background-warning-disabled-border.png and b/app/assets/images/common/button-background-warning-disabled-border.png differ
diff --git a/app/assets/images/common/button-background-warning-disabled.png b/app/assets/images/common/button-background-warning-disabled.png
index a0e743222..d0d8a50bc 100644
Binary files a/app/assets/images/common/button-background-warning-disabled.png and b/app/assets/images/common/button-background-warning-disabled.png differ
diff --git a/app/assets/images/common/button-background-warning-pressed-border.png b/app/assets/images/common/button-background-warning-pressed-border.png
index ca2134e18..9e1fb3bd5 100644
Binary files a/app/assets/images/common/button-background-warning-pressed-border.png and b/app/assets/images/common/button-background-warning-pressed-border.png differ
diff --git a/app/assets/images/common/button-background-warning-pressed.png b/app/assets/images/common/button-background-warning-pressed.png
index 21e6bd380..3503601b0 100644
Binary files a/app/assets/images/common/button-background-warning-pressed.png and b/app/assets/images/common/button-background-warning-pressed.png differ
diff --git a/app/assets/images/common/code_languages/c_icon.png b/app/assets/images/common/code_languages/c_icon.png
index 99cd55241..1f8d29ef0 100755
Binary files a/app/assets/images/common/code_languages/c_icon.png and b/app/assets/images/common/code_languages/c_icon.png differ
diff --git a/app/assets/images/common/code_languages/c_small.png b/app/assets/images/common/code_languages/c_small.png
index 23ba119bb..6fc455605 100644
Binary files a/app/assets/images/common/code_languages/c_small.png and b/app/assets/images/common/code_languages/c_small.png differ
diff --git a/app/assets/images/common/code_languages/clojure_icon.png b/app/assets/images/common/code_languages/clojure_icon.png
index 7152f84c0..e96e75840 100755
Binary files a/app/assets/images/common/code_languages/clojure_icon.png and b/app/assets/images/common/code_languages/clojure_icon.png differ
diff --git a/app/assets/images/common/code_languages/clojure_small.png b/app/assets/images/common/code_languages/clojure_small.png
index 606af0433..1e6a066e3 100644
Binary files a/app/assets/images/common/code_languages/clojure_small.png and b/app/assets/images/common/code_languages/clojure_small.png differ
diff --git a/app/assets/images/common/code_languages/coffeescript_icon.png b/app/assets/images/common/code_languages/coffeescript_icon.png
index 502db9b06..289fb1a3e 100755
Binary files a/app/assets/images/common/code_languages/coffeescript_icon.png and b/app/assets/images/common/code_languages/coffeescript_icon.png differ
diff --git a/app/assets/images/common/code_languages/coffeescript_small.png b/app/assets/images/common/code_languages/coffeescript_small.png
index 86e49ea1c..b6c5f97b3 100644
Binary files a/app/assets/images/common/code_languages/coffeescript_small.png and b/app/assets/images/common/code_languages/coffeescript_small.png differ
diff --git a/app/assets/images/common/code_languages/cpp_icon.png b/app/assets/images/common/code_languages/cpp_icon.png
index c3067378c..362fd2600 100755
Binary files a/app/assets/images/common/code_languages/cpp_icon.png and b/app/assets/images/common/code_languages/cpp_icon.png differ
diff --git a/app/assets/images/common/code_languages/cpp_small.png b/app/assets/images/common/code_languages/cpp_small.png
index df701f002..915bb96cf 100644
Binary files a/app/assets/images/common/code_languages/cpp_small.png and b/app/assets/images/common/code_languages/cpp_small.png differ
diff --git a/app/assets/images/common/code_languages/csharp_icon.png b/app/assets/images/common/code_languages/csharp_icon.png
index d3eff9260..086e3ac55 100755
Binary files a/app/assets/images/common/code_languages/csharp_icon.png and b/app/assets/images/common/code_languages/csharp_icon.png differ
diff --git a/app/assets/images/common/code_languages/csharp_small.png b/app/assets/images/common/code_languages/csharp_small.png
index 86c26aea3..66c7cce60 100644
Binary files a/app/assets/images/common/code_languages/csharp_small.png and b/app/assets/images/common/code_languages/csharp_small.png differ
diff --git a/app/assets/images/common/code_languages/go_icon.png b/app/assets/images/common/code_languages/go_icon.png
index ecbfb0d6a..142b5039f 100755
Binary files a/app/assets/images/common/code_languages/go_icon.png and b/app/assets/images/common/code_languages/go_icon.png differ
diff --git a/app/assets/images/common/code_languages/go_small.png b/app/assets/images/common/code_languages/go_small.png
index 7ff974e07..c4886eeff 100644
Binary files a/app/assets/images/common/code_languages/go_small.png and b/app/assets/images/common/code_languages/go_small.png differ
diff --git a/app/assets/images/common/code_languages/io_icon.png b/app/assets/images/common/code_languages/io_icon.png
index 14f04afc3..eb56cdbdd 100755
Binary files a/app/assets/images/common/code_languages/io_icon.png and b/app/assets/images/common/code_languages/io_icon.png differ
diff --git a/app/assets/images/common/code_languages/io_small.png b/app/assets/images/common/code_languages/io_small.png
index 2bbd5c51e..721b879da 100644
Binary files a/app/assets/images/common/code_languages/io_small.png and b/app/assets/images/common/code_languages/io_small.png differ
diff --git a/app/assets/images/common/code_languages/java_icon.png b/app/assets/images/common/code_languages/java_icon.png
index e39879cae..e04aff83a 100755
Binary files a/app/assets/images/common/code_languages/java_icon.png and b/app/assets/images/common/code_languages/java_icon.png differ
diff --git a/app/assets/images/common/code_languages/java_small.png b/app/assets/images/common/code_languages/java_small.png
index 76126650c..420094d2f 100644
Binary files a/app/assets/images/common/code_languages/java_small.png and b/app/assets/images/common/code_languages/java_small.png differ
diff --git a/app/assets/images/common/code_languages/javascript_icon.png b/app/assets/images/common/code_languages/javascript_icon.png
index 085dbe523..fe866dfe7 100755
Binary files a/app/assets/images/common/code_languages/javascript_icon.png and b/app/assets/images/common/code_languages/javascript_icon.png differ
diff --git a/app/assets/images/common/code_languages/javascript_small.png b/app/assets/images/common/code_languages/javascript_small.png
index 4472bea9d..b2c8f18f2 100644
Binary files a/app/assets/images/common/code_languages/javascript_small.png and b/app/assets/images/common/code_languages/javascript_small.png differ
diff --git a/app/assets/images/common/code_languages/lua_icon.png b/app/assets/images/common/code_languages/lua_icon.png
index e97873a33..92c4b4483 100755
Binary files a/app/assets/images/common/code_languages/lua_icon.png and b/app/assets/images/common/code_languages/lua_icon.png differ
diff --git a/app/assets/images/common/code_languages/lua_small.png b/app/assets/images/common/code_languages/lua_small.png
index c1f183c58..582386e4d 100644
Binary files a/app/assets/images/common/code_languages/lua_small.png and b/app/assets/images/common/code_languages/lua_small.png differ
diff --git a/app/assets/images/common/code_languages/php_icon.png b/app/assets/images/common/code_languages/php_icon.png
index 35757de0b..43116f09d 100755
Binary files a/app/assets/images/common/code_languages/php_icon.png and b/app/assets/images/common/code_languages/php_icon.png differ
diff --git a/app/assets/images/common/code_languages/php_small.png b/app/assets/images/common/code_languages/php_small.png
index 62a5010f3..a3904dc8c 100644
Binary files a/app/assets/images/common/code_languages/php_small.png and b/app/assets/images/common/code_languages/php_small.png differ
diff --git a/app/assets/images/common/code_languages/python_icon.png b/app/assets/images/common/code_languages/python_icon.png
index b8575c4f8..e45ef22a2 100755
Binary files a/app/assets/images/common/code_languages/python_icon.png and b/app/assets/images/common/code_languages/python_icon.png differ
diff --git a/app/assets/images/common/code_languages/python_small.png b/app/assets/images/common/code_languages/python_small.png
index aa303a518..16acb2dcf 100644
Binary files a/app/assets/images/common/code_languages/python_small.png and b/app/assets/images/common/code_languages/python_small.png differ
diff --git a/app/assets/images/common/code_languages/ruby_icon.png b/app/assets/images/common/code_languages/ruby_icon.png
index 7e1192d7a..dc44a1de7 100755
Binary files a/app/assets/images/common/code_languages/ruby_icon.png and b/app/assets/images/common/code_languages/ruby_icon.png differ
diff --git a/app/assets/images/common/code_languages/ruby_small.png b/app/assets/images/common/code_languages/ruby_small.png
index 9839340f7..c5d0d8411 100644
Binary files a/app/assets/images/common/code_languages/ruby_small.png and b/app/assets/images/common/code_languages/ruby_small.png differ
diff --git a/app/assets/images/common/code_languages/swift_icon.png b/app/assets/images/common/code_languages/swift_icon.png
index e789c1516..ba6a3a730 100755
Binary files a/app/assets/images/common/code_languages/swift_icon.png and b/app/assets/images/common/code_languages/swift_icon.png differ
diff --git a/app/assets/images/common/code_languages/swift_small.png b/app/assets/images/common/code_languages/swift_small.png
index 95d9c049a..90470a560 100644
Binary files a/app/assets/images/common/code_languages/swift_small.png and b/app/assets/images/common/code_languages/swift_small.png differ
diff --git a/app/assets/images/common/gem.png b/app/assets/images/common/gem.png
index 9598f6bef..a29f074c6 100644
Binary files a/app/assets/images/common/gem.png and b/app/assets/images/common/gem.png differ
diff --git a/app/assets/images/common/particles/bullet.png b/app/assets/images/common/particles/bullet.png
index 8310ac5b9..f40cf568d 100644
Binary files a/app/assets/images/common/particles/bullet.png and b/app/assets/images/common/particles/bullet.png differ
diff --git a/app/assets/images/common/particles/bullet2.png b/app/assets/images/common/particles/bullet2.png
index 651fd98c2..12024deaf 100644
Binary files a/app/assets/images/common/particles/bullet2.png and b/app/assets/images/common/particles/bullet2.png differ
diff --git a/app/assets/images/common/particles/cloud.png b/app/assets/images/common/particles/cloud.png
index c79d87506..9495f07c7 100644
Binary files a/app/assets/images/common/particles/cloud.png and b/app/assets/images/common/particles/cloud.png differ
diff --git a/app/assets/images/common/particles/cloud_small.png b/app/assets/images/common/particles/cloud_small.png
index 974e8ea21..c6ec0b815 100644
Binary files a/app/assets/images/common/particles/cloud_small.png and b/app/assets/images/common/particles/cloud_small.png differ
diff --git a/app/assets/images/common/particles/smoke.png b/app/assets/images/common/particles/smoke.png
index 7bad8c685..1a7f58e19 100644
Binary files a/app/assets/images/common/particles/smoke.png and b/app/assets/images/common/particles/smoke.png differ
diff --git a/app/assets/images/common/particles/star.png b/app/assets/images/common/particles/star.png
index 5e6f2a12f..8da309b60 100644
Binary files a/app/assets/images/common/particles/star.png and b/app/assets/images/common/particles/star.png differ
diff --git a/app/assets/images/generic-icon.png b/app/assets/images/generic-icon.png
index bd0ccdcbb..564639093 100644
Binary files a/app/assets/images/generic-icon.png and b/app/assets/images/generic-icon.png differ
diff --git a/app/assets/images/jquery.minicolors.png b/app/assets/images/jquery.minicolors.png
index 8fa1e9d90..ef834eac3 100644
Binary files a/app/assets/images/jquery.minicolors.png and b/app/assets/images/jquery.minicolors.png differ
diff --git a/app/assets/images/level/code_editor_background.png b/app/assets/images/level/code_editor_background.png
index daa5d7600..2f5941582 100644
Binary files a/app/assets/images/level/code_editor_background.png and b/app/assets/images/level/code_editor_background.png differ
diff --git a/app/assets/images/level/code_editor_background_border.png b/app/assets/images/level/code_editor_background_border.png
index 9c860168f..621179c86 100644
Binary files a/app/assets/images/level/code_editor_background_border.png and b/app/assets/images/level/code_editor_background_border.png differ
diff --git a/app/assets/images/level/code_editor_error_background.png b/app/assets/images/level/code_editor_error_background.png
index b6fbc72ea..fe4862bdd 100644
Binary files a/app/assets/images/level/code_editor_error_background.png and b/app/assets/images/level/code_editor_error_background.png differ
diff --git a/app/assets/images/level/code_editor_error_background_arrow.png b/app/assets/images/level/code_editor_error_background_arrow.png
index bb2396a69..74b78e91d 100644
Binary files a/app/assets/images/level/code_editor_error_background_arrow.png and b/app/assets/images/level/code_editor_error_background_arrow.png differ
diff --git a/app/assets/images/level/code_editor_info_background.png b/app/assets/images/level/code_editor_info_background.png
index cfbe5a98b..106319bd5 100644
Binary files a/app/assets/images/level/code_editor_info_background.png and b/app/assets/images/level/code_editor_info_background.png differ
diff --git a/app/assets/images/level/code_editor_top_bar_hinge.png b/app/assets/images/level/code_editor_top_bar_hinge.png
index 852df87fc..af639838e 100644
Binary files a/app/assets/images/level/code_editor_top_bar_hinge.png and b/app/assets/images/level/code_editor_top_bar_hinge.png differ
diff --git a/app/assets/images/level/code_editor_top_bar_wood_background.png b/app/assets/images/level/code_editor_top_bar_wood_background.png
index 15d625b08..6468b833e 100644
Binary files a/app/assets/images/level/code_editor_top_bar_wood_background.png and b/app/assets/images/level/code_editor_top_bar_wood_background.png differ
diff --git a/app/assets/images/level/code_palette_wood_background.png b/app/assets/images/level/code_palette_wood_background.png
index dbdda5af6..d6040dbbb 100644
Binary files a/app/assets/images/level/code_palette_wood_background.png and b/app/assets/images/level/code_palette_wood_background.png differ
diff --git a/app/assets/images/level/code_toolbar_background.png b/app/assets/images/level/code_toolbar_background.png
index f05972b5c..59cf36112 100644
Binary files a/app/assets/images/level/code_toolbar_background.png and b/app/assets/images/level/code_toolbar_background.png differ
diff --git a/app/assets/images/level/code_toolbar_run_button_active.png b/app/assets/images/level/code_toolbar_run_button_active.png
index ff3748d39..d056c02ed 100644
Binary files a/app/assets/images/level/code_toolbar_run_button_active.png and b/app/assets/images/level/code_toolbar_run_button_active.png differ
diff --git a/app/assets/images/level/code_toolbar_run_button_active_pressed.png b/app/assets/images/level/code_toolbar_run_button_active_pressed.png
index b9c87d1ba..ee8dda0b6 100644
Binary files a/app/assets/images/level/code_toolbar_run_button_active_pressed.png and b/app/assets/images/level/code_toolbar_run_button_active_pressed.png differ
diff --git a/app/assets/images/level/code_toolbar_run_button_zazz.png b/app/assets/images/level/code_toolbar_run_button_zazz.png
index 8b0e94225..71239be06 100644
Binary files a/app/assets/images/level/code_toolbar_run_button_zazz.png and b/app/assets/images/level/code_toolbar_run_button_zazz.png differ
diff --git a/app/assets/images/level/code_toolbar_run_button_zazz_pressed.png b/app/assets/images/level/code_toolbar_run_button_zazz_pressed.png
index b6d173515..347096dd2 100644
Binary files a/app/assets/images/level/code_toolbar_run_button_zazz_pressed.png and b/app/assets/images/level/code_toolbar_run_button_zazz_pressed.png differ
diff --git a/app/assets/images/level/code_toolbar_submit_button_active.png b/app/assets/images/level/code_toolbar_submit_button_active.png
index 0913c4e28..86d35f78f 100644
Binary files a/app/assets/images/level/code_toolbar_submit_button_active.png and b/app/assets/images/level/code_toolbar_submit_button_active.png differ
diff --git a/app/assets/images/level/code_toolbar_submit_button_active_pressed.png b/app/assets/images/level/code_toolbar_submit_button_active_pressed.png
index 100f085f4..699bafefd 100644
Binary files a/app/assets/images/level/code_toolbar_submit_button_active_pressed.png and b/app/assets/images/level/code_toolbar_submit_button_active_pressed.png differ
diff --git a/app/assets/images/level/code_toolbar_submit_button_zazz.png b/app/assets/images/level/code_toolbar_submit_button_zazz.png
index ff9eeac0c..ef935228a 100644
Binary files a/app/assets/images/level/code_toolbar_submit_button_zazz.png and b/app/assets/images/level/code_toolbar_submit_button_zazz.png differ
diff --git a/app/assets/images/level/code_toolbar_submit_button_zazz_pressed.png b/app/assets/images/level/code_toolbar_submit_button_zazz_pressed.png
index 4875b697b..613919f62 100644
Binary files a/app/assets/images/level/code_toolbar_submit_button_zazz_pressed.png and b/app/assets/images/level/code_toolbar_submit_button_zazz_pressed.png differ
diff --git a/app/assets/images/level/control_bar_background.png b/app/assets/images/level/control_bar_background.png
index 06a150c20..f2656bed5 100644
Binary files a/app/assets/images/level/control_bar_background.png and b/app/assets/images/level/control_bar_background.png differ
diff --git a/app/assets/images/level/control_bar_cap_left.png b/app/assets/images/level/control_bar_cap_left.png
index be927198b..ddf9c06b6 100644
Binary files a/app/assets/images/level/control_bar_cap_left.png and b/app/assets/images/level/control_bar_cap_left.png differ
diff --git a/app/assets/images/level/control_bar_cap_right.png b/app/assets/images/level/control_bar_cap_right.png
index a1362e0d9..224a7f9a5 100644
Binary files a/app/assets/images/level/control_bar_cap_right.png and b/app/assets/images/level/control_bar_cap_right.png differ
diff --git a/app/assets/images/level/control_bar_chain_center.png b/app/assets/images/level/control_bar_chain_center.png
index 420d631a0..cc637629f 100644
Binary files a/app/assets/images/level/control_bar_chain_center.png and b/app/assets/images/level/control_bar_chain_center.png differ
diff --git a/app/assets/images/level/control_bar_chain_right.png b/app/assets/images/level/control_bar_chain_right.png
index b618cb6b8..328083c81 100644
Binary files a/app/assets/images/level/control_bar_chain_right.png and b/app/assets/images/level/control_bar_chain_right.png differ
diff --git a/app/assets/images/level/control_bar_level_name_background.png b/app/assets/images/level/control_bar_level_name_background.png
index 0babffd28..2c935f3bc 100644
Binary files a/app/assets/images/level/control_bar_level_name_background.png and b/app/assets/images/level/control_bar_level_name_background.png differ
diff --git a/app/assets/images/level/csedweek-logo-final-small.jpg b/app/assets/images/level/csedweek-logo-final-small.jpg
index e3fbe384e..be5b1d8e0 100644
Binary files a/app/assets/images/level/csedweek-logo-final-small.jpg and b/app/assets/images/level/csedweek-logo-final-small.jpg differ
diff --git a/app/assets/images/level/dialogue_background.png b/app/assets/images/level/dialogue_background.png
index 79ec8ab35..5190093bc 100644
Binary files a/app/assets/images/level/dialogue_background.png and b/app/assets/images/level/dialogue_background.png differ
diff --git a/app/assets/images/level/footer_background.jpg b/app/assets/images/level/footer_background.jpg
index 97f24c48a..d56e03bc1 100644
Binary files a/app/assets/images/level/footer_background.jpg and b/app/assets/images/level/footer_background.jpg differ
diff --git a/app/assets/images/level/goals_background.png b/app/assets/images/level/goals_background.png
index fe066853a..e48146136 100644
Binary files a/app/assets/images/level/goals_background.png and b/app/assets/images/level/goals_background.png differ
diff --git a/app/assets/images/level/gold_background.png b/app/assets/images/level/gold_background.png
index 738b3592c..93e535e13 100644
Binary files a/app/assets/images/level/gold_background.png and b/app/assets/images/level/gold_background.png differ
diff --git a/app/assets/images/level/gold_icon.png b/app/assets/images/level/gold_icon.png
index a8988a2ef..7e084eac9 100644
Binary files a/app/assets/images/level/gold_icon.png and b/app/assets/images/level/gold_icon.png differ
diff --git a/app/assets/images/level/hud_background.png b/app/assets/images/level/hud_background.png
index e76950a8c..68b9b0c8b 100644
Binary files a/app/assets/images/level/hud_background.png and b/app/assets/images/level/hud_background.png differ
diff --git a/app/assets/images/level/hud_hinge.png b/app/assets/images/level/hud_hinge.png
index bfbd5bc64..24dee2256 100644
Binary files a/app/assets/images/level/hud_hinge.png and b/app/assets/images/level/hud_hinge.png differ
diff --git a/app/assets/images/level/hud_info_icons.png b/app/assets/images/level/hud_info_icons.png
index bff087119..b5aa51229 100644
Binary files a/app/assets/images/level/hud_info_icons.png and b/app/assets/images/level/hud_info_icons.png differ
diff --git a/app/assets/images/level/hud_wood_background.png b/app/assets/images/level/hud_wood_background.png
index 3745a4d6b..53c1e64d9 100644
Binary files a/app/assets/images/level/hud_wood_background.png and b/app/assets/images/level/hud_wood_background.png differ
diff --git a/app/assets/images/level/loading_bar_back.png b/app/assets/images/level/loading_bar_back.png
index 140d90d9c..d59de9a99 100644
Binary files a/app/assets/images/level/loading_bar_back.png and b/app/assets/images/level/loading_bar_back.png differ
diff --git a/app/assets/images/level/loading_bar_fill.png b/app/assets/images/level/loading_bar_fill.png
index 47e9770a7..344e58366 100644
Binary files a/app/assets/images/level/loading_bar_fill.png and b/app/assets/images/level/loading_bar_fill.png differ
diff --git a/app/assets/images/level/loading_bar_rim.png b/app/assets/images/level/loading_bar_rim.png
index b5155e62d..0ae7f91a2 100644
Binary files a/app/assets/images/level/loading_bar_rim.png and b/app/assets/images/level/loading_bar_rim.png differ
diff --git a/app/assets/images/level/loading_left_wing_1366.jpg b/app/assets/images/level/loading_left_wing_1366.jpg
index 29fe67e9c..5ed9564d8 100644
Binary files a/app/assets/images/level/loading_left_wing_1366.jpg and b/app/assets/images/level/loading_left_wing_1366.jpg differ
diff --git a/app/assets/images/level/loading_left_wing_1920.jpg b/app/assets/images/level/loading_left_wing_1920.jpg
index 73aab0978..dc0ffb3aa 100644
Binary files a/app/assets/images/level/loading_left_wing_1920.jpg and b/app/assets/images/level/loading_left_wing_1920.jpg differ
diff --git a/app/assets/images/level/loading_right_wing_1366.jpg b/app/assets/images/level/loading_right_wing_1366.jpg
index 963feba9b..cfb9c82ae 100644
Binary files a/app/assets/images/level/loading_right_wing_1366.jpg and b/app/assets/images/level/loading_right_wing_1366.jpg differ
diff --git a/app/assets/images/level/loading_right_wing_1920.jpg b/app/assets/images/level/loading_right_wing_1920.jpg
index 2fe4465ce..088080b93 100644
Binary files a/app/assets/images/level/loading_right_wing_1920.jpg and b/app/assets/images/level/loading_right_wing_1920.jpg differ
diff --git a/app/assets/images/level/pointer.png b/app/assets/images/level/pointer.png
index af721f635..776f987d6 100644
Binary files a/app/assets/images/level/pointer.png and b/app/assets/images/level/pointer.png differ
diff --git a/app/assets/images/level/popover_background.png b/app/assets/images/level/popover_background.png
index f87ea6d4b..104349ffe 100644
Binary files a/app/assets/images/level/popover_background.png and b/app/assets/images/level/popover_background.png differ
diff --git a/app/assets/images/level/popover_border_background.png b/app/assets/images/level/popover_border_background.png
index a8414487b..cfd5ea5eb 100644
Binary files a/app/assets/images/level/popover_border_background.png and b/app/assets/images/level/popover_border_background.png differ
diff --git a/app/assets/images/level/scrubber_background.png b/app/assets/images/level/scrubber_background.png
index 517a4c8c4..54f2133b1 100644
Binary files a/app/assets/images/level/scrubber_background.png and b/app/assets/images/level/scrubber_background.png differ
diff --git a/app/assets/images/level/scrubber_groove.png b/app/assets/images/level/scrubber_groove.png
index ab5affbcd..cac6e8ca7 100644
Binary files a/app/assets/images/level/scrubber_groove.png and b/app/assets/images/level/scrubber_groove.png differ
diff --git a/app/assets/images/level/scrubber_knob.png b/app/assets/images/level/scrubber_knob.png
index 191b75638..ccf9f40b5 100644
Binary files a/app/assets/images/level/scrubber_knob.png and b/app/assets/images/level/scrubber_knob.png differ
diff --git a/app/assets/images/level/thang_avatar_frame.png b/app/assets/images/level/thang_avatar_frame.png
index 1b4fcc3d5..b6755283c 100644
Binary files a/app/assets/images/level/thang_avatar_frame.png and b/app/assets/images/level/thang_avatar_frame.png differ
diff --git a/app/assets/images/level/victory.png b/app/assets/images/level/victory.png
index e220c19ff..49f1b9ef4 100644
Binary files a/app/assets/images/level/victory.png and b/app/assets/images/level/victory.png differ
diff --git a/app/assets/images/level/wood_texture.png b/app/assets/images/level/wood_texture.png
index 3c33773cb..a2f771592 100644
Binary files a/app/assets/images/level/wood_texture.png and b/app/assets/images/level/wood_texture.png differ
diff --git a/app/assets/images/pages/about/carlos_small.png b/app/assets/images/pages/about/carlos_small.png
index 2f62eaf0e..180223e4d 100644
Binary files a/app/assets/images/pages/about/carlos_small.png and b/app/assets/images/pages/about/carlos_small.png differ
diff --git a/app/assets/images/pages/about/cat_small.png b/app/assets/images/pages/about/cat_small.png
index 312607708..2e74d5011 100644
Binary files a/app/assets/images/pages/about/cat_small.png and b/app/assets/images/pages/about/cat_small.png differ
diff --git a/app/assets/images/pages/about/coco_comic.jpg b/app/assets/images/pages/about/coco_comic.jpg
index 87ff27a54..0cf405379 100644
Binary files a/app/assets/images/pages/about/coco_comic.jpg and b/app/assets/images/pages/about/coco_comic.jpg differ
diff --git a/app/assets/images/pages/about/george_small.png b/app/assets/images/pages/about/george_small.png
index b55fd733d..8ac3c39b8 100644
Binary files a/app/assets/images/pages/about/george_small.png and b/app/assets/images/pages/about/george_small.png differ
diff --git a/app/assets/images/pages/about/jose_small.png b/app/assets/images/pages/about/jose_small.png
index 01bb440a9..c32c819f1 100644
Binary files a/app/assets/images/pages/about/jose_small.png and b/app/assets/images/pages/about/jose_small.png differ
diff --git a/app/assets/images/pages/about/josh_c_small.png b/app/assets/images/pages/about/josh_c_small.png
index 6a04f9e2e..8105ddbc0 100644
Binary files a/app/assets/images/pages/about/josh_c_small.png and b/app/assets/images/pages/about/josh_c_small.png differ
diff --git a/app/assets/images/pages/about/josh_small.png b/app/assets/images/pages/about/josh_small.png
index 80daa5c2a..5164f8359 100644
Binary files a/app/assets/images/pages/about/josh_small.png and b/app/assets/images/pages/about/josh_small.png differ
diff --git a/app/assets/images/pages/about/maka_small.png b/app/assets/images/pages/about/maka_small.png
index ca34a99cf..7501b6229 100644
Binary files a/app/assets/images/pages/about/maka_small.png and b/app/assets/images/pages/about/maka_small.png differ
diff --git a/app/assets/images/pages/about/matt_small.png b/app/assets/images/pages/about/matt_small.png
index 660b2e0db..b74872444 100644
Binary files a/app/assets/images/pages/about/matt_small.png and b/app/assets/images/pages/about/matt_small.png differ
diff --git a/app/assets/images/pages/about/michael_small.png b/app/assets/images/pages/about/michael_small.png
index 84d56d4c3..becf7c60e 100644
Binary files a/app/assets/images/pages/about/michael_small.png and b/app/assets/images/pages/about/michael_small.png differ
diff --git a/app/assets/images/pages/about/nick_small.png b/app/assets/images/pages/about/nick_small.png
index 53a0ccc07..fe9ae1bd8 100644
Binary files a/app/assets/images/pages/about/nick_small.png and b/app/assets/images/pages/about/nick_small.png differ
diff --git a/app/assets/images/pages/about/oleg_small.png b/app/assets/images/pages/about/oleg_small.png
index 4690ed5cc..d7e088f4e 100644
Binary files a/app/assets/images/pages/about/oleg_small.png and b/app/assets/images/pages/about/oleg_small.png differ
diff --git a/app/assets/images/pages/about/pavel_small.png b/app/assets/images/pages/about/pavel_small.png
index 336e3e6e6..357c8d901 100644
Binary files a/app/assets/images/pages/about/pavel_small.png and b/app/assets/images/pages/about/pavel_small.png differ
diff --git a/app/assets/images/pages/about/placeholder.png b/app/assets/images/pages/about/placeholder.png
index 997286b61..b3ed24c55 100644
Binary files a/app/assets/images/pages/about/placeholder.png and b/app/assets/images/pages/about/placeholder.png differ
diff --git a/app/assets/images/pages/about/rob_small.png b/app/assets/images/pages/about/rob_small.png
index afba34d7d..a0b35a16f 100644
Binary files a/app/assets/images/pages/about/rob_small.png and b/app/assets/images/pages/about/rob_small.png differ
diff --git a/app/assets/images/pages/about/robin_small.png b/app/assets/images/pages/about/robin_small.png
index c1ce3331a..dd16eca0f 100644
Binary files a/app/assets/images/pages/about/robin_small.png and b/app/assets/images/pages/about/robin_small.png differ
diff --git a/app/assets/images/pages/about/scott_small.png b/app/assets/images/pages/about/scott_small.png
index fa1e4a023..f08d637e7 100644
Binary files a/app/assets/images/pages/about/scott_small.png and b/app/assets/images/pages/about/scott_small.png differ
diff --git a/app/assets/images/pages/account/profile/education.png b/app/assets/images/pages/account/profile/education.png
index dad4914c6..bd4624c16 100644
Binary files a/app/assets/images/pages/account/profile/education.png and b/app/assets/images/pages/account/profile/education.png differ
diff --git a/app/assets/images/pages/account/profile/icon_facebook.png b/app/assets/images/pages/account/profile/icon_facebook.png
index b775c18fa..76aec3820 100644
Binary files a/app/assets/images/pages/account/profile/icon_facebook.png and b/app/assets/images/pages/account/profile/icon_facebook.png differ
diff --git a/app/assets/images/pages/account/profile/icon_github.png b/app/assets/images/pages/account/profile/icon_github.png
index fc1801abc..376a9c217 100644
Binary files a/app/assets/images/pages/account/profile/icon_github.png and b/app/assets/images/pages/account/profile/icon_github.png differ
diff --git a/app/assets/images/pages/account/profile/icon_gplus.png b/app/assets/images/pages/account/profile/icon_gplus.png
index c2343eb50..ca772c7ac 100644
Binary files a/app/assets/images/pages/account/profile/icon_gplus.png and b/app/assets/images/pages/account/profile/icon_gplus.png differ
diff --git a/app/assets/images/pages/account/profile/icon_linkedin.png b/app/assets/images/pages/account/profile/icon_linkedin.png
index cdd0ff6c2..17af2f66e 100644
Binary files a/app/assets/images/pages/account/profile/icon_linkedin.png and b/app/assets/images/pages/account/profile/icon_linkedin.png differ
diff --git a/app/assets/images/pages/account/profile/icon_twitter.png b/app/assets/images/pages/account/profile/icon_twitter.png
index 1280ad6df..82a2862e4 100644
Binary files a/app/assets/images/pages/account/profile/icon_twitter.png and b/app/assets/images/pages/account/profile/icon_twitter.png differ
diff --git a/app/assets/images/pages/account/profile/sample_profile.png b/app/assets/images/pages/account/profile/sample_profile.png
index b61294854..9e7765ef8 100644
Binary files a/app/assets/images/pages/account/profile/sample_profile.png and b/app/assets/images/pages/account/profile/sample_profile.png differ
diff --git a/app/assets/images/pages/account/profile/sample_profile_thumb.png b/app/assets/images/pages/account/profile/sample_profile_thumb.png
index bc1e63e13..061d0c64e 100644
Binary files a/app/assets/images/pages/account/profile/sample_profile_thumb.png and b/app/assets/images/pages/account/profile/sample_profile_thumb.png differ
diff --git a/app/assets/images/pages/account/profile/sample_project.png b/app/assets/images/pages/account/profile/sample_project.png
index feecec3c7..d8422135d 100644
Binary files a/app/assets/images/pages/account/profile/sample_project.png and b/app/assets/images/pages/account/profile/sample_project.png differ
diff --git a/app/assets/images/pages/account/profile/work.png b/app/assets/images/pages/account/profile/work.png
index 72e659071..3242a2b28 100644
Binary files a/app/assets/images/pages/account/profile/work.png and b/app/assets/images/pages/account/profile/work.png differ
diff --git a/app/assets/images/pages/account/subscription/teacher-banner.png b/app/assets/images/pages/account/subscription/teacher-banner.png
index 445456ea9..6ee445ccd 100644
Binary files a/app/assets/images/pages/account/subscription/teacher-banner.png and b/app/assets/images/pages/account/subscription/teacher-banner.png differ
diff --git a/app/assets/images/pages/base/background.jpg b/app/assets/images/pages/base/background.jpg
index c924faf89..db0bd47ba 100644
Binary files a/app/assets/images/pages/base/background.jpg and b/app/assets/images/pages/base/background.jpg differ
diff --git a/app/assets/images/pages/base/firebase.png b/app/assets/images/pages/base/firebase.png
index 5ecfb5e2d..284ddb865 100644
Binary files a/app/assets/images/pages/base/firebase.png and b/app/assets/images/pages/base/firebase.png differ
diff --git a/app/assets/images/pages/base/glyphicons-halflings-white.png b/app/assets/images/pages/base/glyphicons-halflings-white.png
index 9167abf53..7507bf61f 100644
Binary files a/app/assets/images/pages/base/glyphicons-halflings-white.png and b/app/assets/images/pages/base/glyphicons-halflings-white.png differ
diff --git a/app/assets/images/pages/base/glyphicons-halflings.png b/app/assets/images/pages/base/glyphicons-halflings.png
index 5b67ffda5..f241c76f9 100644
Binary files a/app/assets/images/pages/base/glyphicons-halflings.png and b/app/assets/images/pages/base/glyphicons-halflings.png differ
diff --git a/app/assets/images/pages/base/logo.png b/app/assets/images/pages/base/logo.png
index e7a97eb3c..0640f4147 100644
Binary files a/app/assets/images/pages/base/logo.png and b/app/assets/images/pages/base/logo.png differ
diff --git a/app/assets/images/pages/base/logo_square_120.png b/app/assets/images/pages/base/logo_square_120.png
index 08f3c3eff..b94043c2b 100644
Binary files a/app/assets/images/pages/base/logo_square_120.png and b/app/assets/images/pages/base/logo_square_120.png differ
diff --git a/app/assets/images/pages/base/logo_square_250.png b/app/assets/images/pages/base/logo_square_250.png
index 7f2b50e3b..7cabb0b2d 100644
Binary files a/app/assets/images/pages/base/logo_square_250.png and b/app/assets/images/pages/base/logo_square_250.png differ
diff --git a/app/assets/images/pages/base/modal_background.png b/app/assets/images/pages/base/modal_background.png
index ae67e9460..a79eb60dc 100644
Binary files a/app/assets/images/pages/base/modal_background.png and b/app/assets/images/pages/base/modal_background.png differ
diff --git a/app/assets/images/pages/base/nav_background.png b/app/assets/images/pages/base/nav_background.png
index d9df28f57..d5f314a16 100644
Binary files a/app/assets/images/pages/base/nav_background.png and b/app/assets/images/pages/base/nav_background.png differ
diff --git a/app/assets/images/pages/base/play_button.png b/app/assets/images/pages/base/play_button.png
index 7d4c74966..d8d8e08e5 100644
Binary files a/app/assets/images/pages/base/play_button.png and b/app/assets/images/pages/base/play_button.png differ
diff --git a/app/assets/images/pages/base/recruitment_logo.png b/app/assets/images/pages/base/recruitment_logo.png
index 6e107540b..828da070c 100644
Binary files a/app/assets/images/pages/base/recruitment_logo.png and b/app/assets/images/pages/base/recruitment_logo.png differ
diff --git a/app/assets/images/pages/careers/recruiting.png b/app/assets/images/pages/careers/recruiting.png
index 6ea355237..270f11588 100644
Binary files a/app/assets/images/pages/careers/recruiting.png and b/app/assets/images/pages/careers/recruiting.png differ
diff --git a/app/assets/images/pages/clans/dashboard_preview.png b/app/assets/images/pages/clans/dashboard_preview.png
index d45f8911f..9fffdd0e3 100644
Binary files a/app/assets/images/pages/clans/dashboard_preview.png and b/app/assets/images/pages/clans/dashboard_preview.png differ
diff --git a/app/assets/images/pages/community/adventurer.png b/app/assets/images/pages/community/adventurer.png
index 6b7553a60..99a1e2912 100644
Binary files a/app/assets/images/pages/community/adventurer.png and b/app/assets/images/pages/community/adventurer.png differ
diff --git a/app/assets/images/pages/community/ambassador.png b/app/assets/images/pages/community/ambassador.png
index 462f7c8de..508a0cdc8 100644
Binary files a/app/assets/images/pages/community/ambassador.png and b/app/assets/images/pages/community/ambassador.png differ
diff --git a/app/assets/images/pages/community/archmage.png b/app/assets/images/pages/community/archmage.png
index 4bdae4b03..6f107c306 100644
Binary files a/app/assets/images/pages/community/archmage.png and b/app/assets/images/pages/community/archmage.png differ
diff --git a/app/assets/images/pages/community/article.png b/app/assets/images/pages/community/article.png
index fcc391939..263dc860f 100644
Binary files a/app/assets/images/pages/community/article.png and b/app/assets/images/pages/community/article.png differ
diff --git a/app/assets/images/pages/community/artisan.png b/app/assets/images/pages/community/artisan.png
index c3a5d1680..b1a3ce83a 100644
Binary files a/app/assets/images/pages/community/artisan.png and b/app/assets/images/pages/community/artisan.png differ
diff --git a/app/assets/images/pages/community/diplomat.png b/app/assets/images/pages/community/diplomat.png
index eaaf21b37..fe6e02ff9 100644
Binary files a/app/assets/images/pages/community/diplomat.png and b/app/assets/images/pages/community/diplomat.png differ
diff --git a/app/assets/images/pages/community/level.png b/app/assets/images/pages/community/level.png
index b5bb78f03..7934f6601 100644
Binary files a/app/assets/images/pages/community/level.png and b/app/assets/images/pages/community/level.png differ
diff --git a/app/assets/images/pages/community/logo_discourse.png b/app/assets/images/pages/community/logo_discourse.png
index 75be80ecc..11d218961 100644
Binary files a/app/assets/images/pages/community/logo_discourse.png and b/app/assets/images/pages/community/logo_discourse.png differ
diff --git a/app/assets/images/pages/community/logo_facebook.png b/app/assets/images/pages/community/logo_facebook.png
index 0575c3e70..be09a2e0f 100644
Binary files a/app/assets/images/pages/community/logo_facebook.png and b/app/assets/images/pages/community/logo_facebook.png differ
diff --git a/app/assets/images/pages/community/logo_g+.png b/app/assets/images/pages/community/logo_g+.png
index 1ca939a39..8cd24a9ee 100644
Binary files a/app/assets/images/pages/community/logo_g+.png and b/app/assets/images/pages/community/logo_g+.png differ
diff --git a/app/assets/images/pages/community/logo_github.png b/app/assets/images/pages/community/logo_github.png
index a7c81809f..8c5c9e20b 100644
Binary files a/app/assets/images/pages/community/logo_github.png and b/app/assets/images/pages/community/logo_github.png differ
diff --git a/app/assets/images/pages/community/logo_hipchat.png b/app/assets/images/pages/community/logo_hipchat.png
index aa47b8010..b3d0e0d0f 100644
Binary files a/app/assets/images/pages/community/logo_hipchat.png and b/app/assets/images/pages/community/logo_hipchat.png differ
diff --git a/app/assets/images/pages/community/logo_sett.png b/app/assets/images/pages/community/logo_sett.png
index 38c0aa7bc..96d7e588c 100644
Binary files a/app/assets/images/pages/community/logo_sett.png and b/app/assets/images/pages/community/logo_sett.png differ
diff --git a/app/assets/images/pages/community/logo_twitter.png b/app/assets/images/pages/community/logo_twitter.png
index a65889262..35dc8a41b 100644
Binary files a/app/assets/images/pages/community/logo_twitter.png and b/app/assets/images/pages/community/logo_twitter.png differ
diff --git a/app/assets/images/pages/community/scribe.png b/app/assets/images/pages/community/scribe.png
index b44a8835a..30df40abc 100644
Binary files a/app/assets/images/pages/community/scribe.png and b/app/assets/images/pages/community/scribe.png differ
diff --git a/app/assets/images/pages/community/thang.png b/app/assets/images/pages/community/thang.png
index 1d6ef69fa..b7e52be24 100644
Binary files a/app/assets/images/pages/community/thang.png and b/app/assets/images/pages/community/thang.png differ
diff --git a/app/assets/images/pages/contribute/adventurer.png b/app/assets/images/pages/contribute/adventurer.png
index c23e10b9e..fa3ed67cb 100644
Binary files a/app/assets/images/pages/contribute/adventurer.png and b/app/assets/images/pages/contribute/adventurer.png differ
diff --git a/app/assets/images/pages/contribute/ambassador.png b/app/assets/images/pages/contribute/ambassador.png
index 177e6deeb..3d212e1de 100644
Binary files a/app/assets/images/pages/contribute/ambassador.png and b/app/assets/images/pages/contribute/ambassador.png differ
diff --git a/app/assets/images/pages/contribute/archmage.png b/app/assets/images/pages/contribute/archmage.png
index 6679c69e8..10c235078 100644
Binary files a/app/assets/images/pages/contribute/archmage.png and b/app/assets/images/pages/contribute/archmage.png differ
diff --git a/app/assets/images/pages/contribute/artisan.png b/app/assets/images/pages/contribute/artisan.png
index db357cddf..6a6db3613 100644
Binary files a/app/assets/images/pages/contribute/artisan.png and b/app/assets/images/pages/contribute/artisan.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_adventurer.png b/app/assets/images/pages/contribute/class_detail_adventurer.png
index 2e738ae2d..11dd43372 100644
Binary files a/app/assets/images/pages/contribute/class_detail_adventurer.png and b/app/assets/images/pages/contribute/class_detail_adventurer.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_ambassador.png b/app/assets/images/pages/contribute/class_detail_ambassador.png
index 632cb527b..3211000a4 100644
Binary files a/app/assets/images/pages/contribute/class_detail_ambassador.png and b/app/assets/images/pages/contribute/class_detail_ambassador.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_archmage.png b/app/assets/images/pages/contribute/class_detail_archmage.png
index 25b0145bd..2575d2878 100644
Binary files a/app/assets/images/pages/contribute/class_detail_archmage.png and b/app/assets/images/pages/contribute/class_detail_archmage.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_artisan.png b/app/assets/images/pages/contribute/class_detail_artisan.png
index 9d4f001e3..06cd17511 100644
Binary files a/app/assets/images/pages/contribute/class_detail_artisan.png and b/app/assets/images/pages/contribute/class_detail_artisan.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_diplomat.png b/app/assets/images/pages/contribute/class_detail_diplomat.png
index d79d59bdf..6ceb08bf1 100644
Binary files a/app/assets/images/pages/contribute/class_detail_diplomat.png and b/app/assets/images/pages/contribute/class_detail_diplomat.png differ
diff --git a/app/assets/images/pages/contribute/class_detail_scribe.png b/app/assets/images/pages/contribute/class_detail_scribe.png
index a9378b41c..1801975ae 100644
Binary files a/app/assets/images/pages/contribute/class_detail_scribe.png and b/app/assets/images/pages/contribute/class_detail_scribe.png differ
diff --git a/app/assets/images/pages/contribute/counselor.png b/app/assets/images/pages/contribute/counselor.png
index 4f97d1939..f16e7e8c8 100644
Binary files a/app/assets/images/pages/contribute/counselor.png and b/app/assets/images/pages/contribute/counselor.png differ
diff --git a/app/assets/images/pages/contribute/tile_adventurer.png b/app/assets/images/pages/contribute/tile_adventurer.png
index 6b6a8b5eb..cf00fc20d 100644
Binary files a/app/assets/images/pages/contribute/tile_adventurer.png and b/app/assets/images/pages/contribute/tile_adventurer.png differ
diff --git a/app/assets/images/pages/contribute/tile_ambassador.png b/app/assets/images/pages/contribute/tile_ambassador.png
index a36b2ca5b..0d1e2cc58 100644
Binary files a/app/assets/images/pages/contribute/tile_ambassador.png and b/app/assets/images/pages/contribute/tile_ambassador.png differ
diff --git a/app/assets/images/pages/contribute/tile_archmage.png b/app/assets/images/pages/contribute/tile_archmage.png
index bb7659713..75d91de50 100644
Binary files a/app/assets/images/pages/contribute/tile_archmage.png and b/app/assets/images/pages/contribute/tile_archmage.png differ
diff --git a/app/assets/images/pages/contribute/tile_artisan.png b/app/assets/images/pages/contribute/tile_artisan.png
index 53b00e73a..90d4a13c0 100644
Binary files a/app/assets/images/pages/contribute/tile_artisan.png and b/app/assets/images/pages/contribute/tile_artisan.png differ
diff --git a/app/assets/images/pages/contribute/tile_diplomat.png b/app/assets/images/pages/contribute/tile_diplomat.png
index 46704bc0a..09308c8a9 100644
Binary files a/app/assets/images/pages/contribute/tile_diplomat.png and b/app/assets/images/pages/contribute/tile_diplomat.png differ
diff --git a/app/assets/images/pages/contribute/tile_scribe.png b/app/assets/images/pages/contribute/tile_scribe.png
index 3ee5a429a..8f7aa3ef9 100644
Binary files a/app/assets/images/pages/contribute/tile_scribe.png and b/app/assets/images/pages/contribute/tile_scribe.png differ
diff --git a/app/assets/images/pages/courses/101_info.png b/app/assets/images/pages/courses/101_info.png
index a2759a3ad..6a73381a9 100644
Binary files a/app/assets/images/pages/courses/101_info.png and b/app/assets/images/pages/courses/101_info.png differ
diff --git a/app/assets/images/pages/courses/102_info.png b/app/assets/images/pages/courses/102_info.png
index 91d3f02d7..4a94f7889 100644
Binary files a/app/assets/images/pages/courses/102_info.png and b/app/assets/images/pages/courses/102_info.png differ
diff --git a/app/assets/images/pages/courses/103_info.png b/app/assets/images/pages/courses/103_info.png
index 666b89080..54339ac1a 100644
Binary files a/app/assets/images/pages/courses/103_info.png and b/app/assets/images/pages/courses/103_info.png differ
diff --git a/app/assets/images/pages/courses/104_info.png b/app/assets/images/pages/courses/104_info.png
index 3695b60b4..4b73c4548 100644
Binary files a/app/assets/images/pages/courses/104_info.png and b/app/assets/images/pages/courses/104_info.png differ
diff --git a/app/assets/images/pages/courses/105_info.png b/app/assets/images/pages/courses/105_info.png
index f04b7b836..063769b8a 100644
Binary files a/app/assets/images/pages/courses/105_info.png and b/app/assets/images/pages/courses/105_info.png differ
diff --git a/app/assets/images/pages/courses/106_info.png b/app/assets/images/pages/courses/106_info.png
index 5e7aa3a65..11396dbfa 100644
Binary files a/app/assets/images/pages/courses/106_info.png and b/app/assets/images/pages/courses/106_info.png differ
diff --git a/app/assets/images/pages/courses/107_info.png b/app/assets/images/pages/courses/107_info.png
index fa0e92b14..f2b5ce55e 100644
Binary files a/app/assets/images/pages/courses/107_info.png and b/app/assets/images/pages/courses/107_info.png differ
diff --git a/app/assets/images/pages/courses/coco_complab.png b/app/assets/images/pages/courses/coco_complab.png
index 35e6d7c68..531ab2be1 100644
Binary files a/app/assets/images/pages/courses/coco_complab.png and b/app/assets/images/pages/courses/coco_complab.png differ
diff --git a/app/assets/images/pages/editor/level/preset_dungeon_large.jpg b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg
index b39f3558e..a5b6a59df 100644
Binary files a/app/assets/images/pages/editor/level/preset_dungeon_large.jpg and b/app/assets/images/pages/editor/level/preset_dungeon_large.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_dungeon_small.jpg b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg
index a8fea9c5c..d3c1ee363 100644
Binary files a/app/assets/images/pages/editor/level/preset_dungeon_small.jpg and b/app/assets/images/pages/editor/level/preset_dungeon_small.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_grassy_large.jpg b/app/assets/images/pages/editor/level/preset_grassy_large.jpg
index 53c8bc2a7..33a844908 100644
Binary files a/app/assets/images/pages/editor/level/preset_grassy_large.jpg and b/app/assets/images/pages/editor/level/preset_grassy_large.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_grassy_small.jpg b/app/assets/images/pages/editor/level/preset_grassy_small.jpg
index ed9356944..6ff2c9aca 100644
Binary files a/app/assets/images/pages/editor/level/preset_grassy_small.jpg and b/app/assets/images/pages/editor/level/preset_grassy_small.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_indoor_large.jpg b/app/assets/images/pages/editor/level/preset_indoor_large.jpg
index 0ea8b6907..e4e0e13a5 100644
Binary files a/app/assets/images/pages/editor/level/preset_indoor_large.jpg and b/app/assets/images/pages/editor/level/preset_indoor_large.jpg differ
diff --git a/app/assets/images/pages/editor/level/preset_indoor_small.jpg b/app/assets/images/pages/editor/level/preset_indoor_small.jpg
index e172b56bd..1db2c9966 100644
Binary files a/app/assets/images/pages/editor/level/preset_indoor_small.jpg and b/app/assets/images/pages/editor/level/preset_indoor_small.jpg differ
diff --git a/app/assets/images/pages/employer/anon_user.png b/app/assets/images/pages/employer/anon_user.png
index 7191d604f..f4e24c0ed 100644
Binary files a/app/assets/images/pages/employer/anon_user.png and b/app/assets/images/pages/employer/anon_user.png differ
diff --git a/app/assets/images/pages/employer/artisanal_claim.png b/app/assets/images/pages/employer/artisanal_claim.png
index 4a4918ff7..8ba5cdd8b 100644
Binary files a/app/assets/images/pages/employer/artisanal_claim.png and b/app/assets/images/pages/employer/artisanal_claim.png differ
diff --git a/app/assets/images/pages/employer/briefcase.png b/app/assets/images/pages/employer/briefcase.png
index 66e605a47..0bc6cae5f 100644
Binary files a/app/assets/images/pages/employer/briefcase.png and b/app/assets/images/pages/employer/briefcase.png differ
diff --git a/app/assets/images/pages/employer/education.png b/app/assets/images/pages/employer/education.png
index 6c4d5b63c..d9c249ea6 100644
Binary files a/app/assets/images/pages/employer/education.png and b/app/assets/images/pages/employer/education.png differ
diff --git a/app/assets/images/pages/employer/employer_icon1.png b/app/assets/images/pages/employer/employer_icon1.png
index 1b58ce8dd..53f0ab199 100644
Binary files a/app/assets/images/pages/employer/employer_icon1.png and b/app/assets/images/pages/employer/employer_icon1.png differ
diff --git a/app/assets/images/pages/employer/employer_icon2.png b/app/assets/images/pages/employer/employer_icon2.png
index 3ea5b571d..220d36b94 100644
Binary files a/app/assets/images/pages/employer/employer_icon2.png and b/app/assets/images/pages/employer/employer_icon2.png differ
diff --git a/app/assets/images/pages/employer/employer_icon3.png b/app/assets/images/pages/employer/employer_icon3.png
index d29b0e609..d2ff87223 100644
Binary files a/app/assets/images/pages/employer/employer_icon3.png and b/app/assets/images/pages/employer/employer_icon3.png differ
diff --git a/app/assets/images/pages/employer/employer_icon4.png b/app/assets/images/pages/employer/employer_icon4.png
index df5c40222..8657a3154 100644
Binary files a/app/assets/images/pages/employer/employer_icon4.png and b/app/assets/images/pages/employer/employer_icon4.png differ
diff --git a/app/assets/images/pages/employer/employer_icon5.png b/app/assets/images/pages/employer/employer_icon5.png
index 85d94b04c..ed231d159 100644
Binary files a/app/assets/images/pages/employer/employer_icon5.png and b/app/assets/images/pages/employer/employer_icon5.png differ
diff --git a/app/assets/images/pages/employer/employer_icon6.png b/app/assets/images/pages/employer/employer_icon6.png
index bf3bb9e90..e7f401f34 100644
Binary files a/app/assets/images/pages/employer/employer_icon6.png and b/app/assets/images/pages/employer/employer_icon6.png differ
diff --git a/app/assets/images/pages/employer/location.png b/app/assets/images/pages/employer/location.png
index 3a21f6422..75ab1d091 100644
Binary files a/app/assets/images/pages/employer/location.png and b/app/assets/images/pages/employer/location.png differ
diff --git a/app/assets/images/pages/employer/tag.png b/app/assets/images/pages/employer/tag.png
index 0b022ce92..db88dabf3 100644
Binary files a/app/assets/images/pages/employer/tag.png and b/app/assets/images/pages/employer/tag.png differ
diff --git a/app/assets/images/pages/game-menu/lock-processed.png b/app/assets/images/pages/game-menu/lock-processed.png
index bb038b4b0..2444a9735 100644
Binary files a/app/assets/images/pages/game-menu/lock-processed.png and b/app/assets/images/pages/game-menu/lock-processed.png differ
diff --git a/app/assets/images/pages/game-menu/lock.png b/app/assets/images/pages/game-menu/lock.png
index c7d71ea7e..6aae22484 100644
Binary files a/app/assets/images/pages/game-menu/lock.png and b/app/assets/images/pages/game-menu/lock.png differ
diff --git a/app/assets/images/pages/game-menu/save-load-history-stub.png b/app/assets/images/pages/game-menu/save-load-history-stub.png
index 885db7010..914e2c6be 100644
Binary files a/app/assets/images/pages/game-menu/save-load-history-stub.png and b/app/assets/images/pages/game-menu/save-load-history-stub.png differ
diff --git a/app/assets/images/pages/game-menu/save-load-stub.png b/app/assets/images/pages/game-menu/save-load-stub.png
index ee201430e..e93b1b853 100644
Binary files a/app/assets/images/pages/game-menu/save-load-stub.png and b/app/assets/images/pages/game-menu/save-load-stub.png differ
diff --git a/app/assets/images/pages/game-menu/slot-icons.png b/app/assets/images/pages/game-menu/slot-icons.png
index b7ad722b1..ce6019df0 100644
Binary files a/app/assets/images/pages/game-menu/slot-icons.png and b/app/assets/images/pages/game-menu/slot-icons.png differ
diff --git a/app/assets/images/pages/home/boy_coding.png b/app/assets/images/pages/home/boy_coding.png
index 474d8c958..1ad50d1e0 100644
Binary files a/app/assets/images/pages/home/boy_coding.png and b/app/assets/images/pages/home/boy_coding.png differ
diff --git a/app/assets/images/pages/home/girl_coding.png b/app/assets/images/pages/home/girl_coding.png
index 4d587c31a..810d1cd60 100644
Binary files a/app/assets/images/pages/home/girl_coding.png and b/app/assets/images/pages/home/girl_coding.png differ
diff --git a/app/assets/images/pages/home/play_button.png b/app/assets/images/pages/home/play_button.png
index 7d4c74966..d8d8e08e5 100644
Binary files a/app/assets/images/pages/home/play_button.png and b/app/assets/images/pages/home/play_button.png differ
diff --git a/app/assets/images/pages/modal/auth/extra-pane.png b/app/assets/images/pages/modal/auth/extra-pane.png
index 83c8d6ee5..70ba6d0e1 100644
Binary files a/app/assets/images/pages/modal/auth/extra-pane.png and b/app/assets/images/pages/modal/auth/extra-pane.png differ
diff --git a/app/assets/images/pages/modal/auth/github_icon.png b/app/assets/images/pages/modal/auth/github_icon.png
index c4d3bb43b..908cd5141 100644
Binary files a/app/assets/images/pages/modal/auth/github_icon.png and b/app/assets/images/pages/modal/auth/github_icon.png differ
diff --git a/app/assets/images/pages/modal/auth/login-background.png b/app/assets/images/pages/modal/auth/login-background.png
index 00ee8341f..8e9b6c626 100644
Binary files a/app/assets/images/pages/modal/auth/login-background.png and b/app/assets/images/pages/modal/auth/login-background.png differ
diff --git a/app/assets/images/pages/modal/auth/signup-background.png b/app/assets/images/pages/modal/auth/signup-background.png
index add84857b..21fa8d204 100644
Binary files a/app/assets/images/pages/modal/auth/signup-background.png and b/app/assets/images/pages/modal/auth/signup-background.png differ
diff --git a/app/assets/images/pages/not_found/404_1.png b/app/assets/images/pages/not_found/404_1.png
index 0eab89857..cf443d8b4 100644
Binary files a/app/assets/images/pages/not_found/404_1.png and b/app/assets/images/pages/not_found/404_1.png differ
diff --git a/app/assets/images/pages/not_found/404_2.png b/app/assets/images/pages/not_found/404_2.png
index 156de14e1..77bd7dd21 100644
Binary files a/app/assets/images/pages/not_found/404_2.png and b/app/assets/images/pages/not_found/404_2.png differ
diff --git a/app/assets/images/pages/not_found/404_3.png b/app/assets/images/pages/not_found/404_3.png
index a990d55dd..66fde0e05 100644
Binary files a/app/assets/images/pages/not_found/404_3.png and b/app/assets/images/pages/not_found/404_3.png differ
diff --git a/app/assets/images/pages/play/campaign-banner.png b/app/assets/images/pages/play/campaign-banner.png
index 0ad6af9a0..34cf414ee 100644
Binary files a/app/assets/images/pages/play/campaign-banner.png and b/app/assets/images/pages/play/campaign-banner.png differ
diff --git a/app/assets/images/pages/play/ladder/easy_button.png b/app/assets/images/pages/play/ladder/easy_button.png
index c75dc83f9..35d91ef23 100644
Binary files a/app/assets/images/pages/play/ladder/easy_button.png and b/app/assets/images/pages/play/ladder/easy_button.png differ
diff --git a/app/assets/images/pages/play/ladder/hard_button.png b/app/assets/images/pages/play/ladder/hard_button.png
index 880b42442..1403f4cc9 100644
Binary files a/app/assets/images/pages/play/ladder/hard_button.png and b/app/assets/images/pages/play/ladder/hard_button.png differ
diff --git a/app/assets/images/pages/play/ladder/humans_ladder_easy.png b/app/assets/images/pages/play/ladder/humans_ladder_easy.png
index 095b57688..df3af194a 100644
Binary files a/app/assets/images/pages/play/ladder/humans_ladder_easy.png and b/app/assets/images/pages/play/ladder/humans_ladder_easy.png differ
diff --git a/app/assets/images/pages/play/ladder/humans_ladder_hard.png b/app/assets/images/pages/play/ladder/humans_ladder_hard.png
index 90afbd048..9e64ac0ad 100644
Binary files a/app/assets/images/pages/play/ladder/humans_ladder_hard.png and b/app/assets/images/pages/play/ladder/humans_ladder_hard.png differ
diff --git a/app/assets/images/pages/play/ladder/humans_ladder_medium.png b/app/assets/images/pages/play/ladder/humans_ladder_medium.png
index 4d5570ebf..b321f250f 100644
Binary files a/app/assets/images/pages/play/ladder/humans_ladder_medium.png and b/app/assets/images/pages/play/ladder/humans_ladder_medium.png differ
diff --git a/app/assets/images/pages/play/ladder/humans_ladder_tutorial.png b/app/assets/images/pages/play/ladder/humans_ladder_tutorial.png
index d4f1ffffe..eb9a8fec7 100644
Binary files a/app/assets/images/pages/play/ladder/humans_ladder_tutorial.png and b/app/assets/images/pages/play/ladder/humans_ladder_tutorial.png differ
diff --git a/app/assets/images/pages/play/ladder/medium_button.png b/app/assets/images/pages/play/ladder/medium_button.png
index 41f87572e..0ec3466a2 100644
Binary files a/app/assets/images/pages/play/ladder/medium_button.png and b/app/assets/images/pages/play/ladder/medium_button.png differ
diff --git a/app/assets/images/pages/play/ladder/multiplayer_notext.jpg b/app/assets/images/pages/play/ladder/multiplayer_notext.jpg
index b4657d397..aba55f233 100644
Binary files a/app/assets/images/pages/play/ladder/multiplayer_notext.jpg and b/app/assets/images/pages/play/ladder/multiplayer_notext.jpg differ
diff --git a/app/assets/images/pages/play/ladder/ogres_ladder_easy.png b/app/assets/images/pages/play/ladder/ogres_ladder_easy.png
index ae82c36ca..b09c7ac4b 100644
Binary files a/app/assets/images/pages/play/ladder/ogres_ladder_easy.png and b/app/assets/images/pages/play/ladder/ogres_ladder_easy.png differ
diff --git a/app/assets/images/pages/play/ladder/ogres_ladder_hard.png b/app/assets/images/pages/play/ladder/ogres_ladder_hard.png
index 36204caf5..9b33c9347 100644
Binary files a/app/assets/images/pages/play/ladder/ogres_ladder_hard.png and b/app/assets/images/pages/play/ladder/ogres_ladder_hard.png differ
diff --git a/app/assets/images/pages/play/ladder/ogres_ladder_medium.png b/app/assets/images/pages/play/ladder/ogres_ladder_medium.png
index a86ac9585..52607b498 100644
Binary files a/app/assets/images/pages/play/ladder/ogres_ladder_medium.png and b/app/assets/images/pages/play/ladder/ogres_ladder_medium.png differ
diff --git a/app/assets/images/pages/play/ladder/ogres_ladder_tutorial.png b/app/assets/images/pages/play/ladder/ogres_ladder_tutorial.png
index 939a534c7..b56123054 100644
Binary files a/app/assets/images/pages/play/ladder/ogres_ladder_tutorial.png and b/app/assets/images/pages/play/ladder/ogres_ladder_tutorial.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_aws.png b/app/assets/images/pages/play/ladder/prize_aws.png
index 65facdf8f..d5a86731b 100644
Binary files a/app/assets/images/pages/play/ladder/prize_aws.png and b/app/assets/images/pages/play/ladder/prize_aws.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_cash1.png b/app/assets/images/pages/play/ladder/prize_cash1.png
index 2508a7e3c..bf6a01358 100644
Binary files a/app/assets/images/pages/play/ladder/prize_cash1.png and b/app/assets/images/pages/play/ladder/prize_cash1.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_cash2.png b/app/assets/images/pages/play/ladder/prize_cash2.png
index 2b13bcc3d..13682cad1 100644
Binary files a/app/assets/images/pages/play/ladder/prize_cash2.png and b/app/assets/images/pages/play/ladder/prize_cash2.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_cash3.png b/app/assets/images/pages/play/ladder/prize_cash3.png
index c70f428ab..31fa6824c 100644
Binary files a/app/assets/images/pages/play/ladder/prize_cash3.png and b/app/assets/images/pages/play/ladder/prize_cash3.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_custom_avatar.png b/app/assets/images/pages/play/ladder/prize_custom_avatar.png
index fae6cf950..762443435 100644
Binary files a/app/assets/images/pages/play/ladder/prize_custom_avatar.png and b/app/assets/images/pages/play/ladder/prize_custom_avatar.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_custom_wizard.png b/app/assets/images/pages/play/ladder/prize_custom_wizard.png
index 108a31e69..9629a1e80 100644
Binary files a/app/assets/images/pages/play/ladder/prize_custom_wizard.png and b/app/assets/images/pages/play/ladder/prize_custom_wizard.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_digital_ocean.png b/app/assets/images/pages/play/ladder/prize_digital_ocean.png
index e9c0406c1..b33662fe9 100644
Binary files a/app/assets/images/pages/play/ladder/prize_digital_ocean.png and b/app/assets/images/pages/play/ladder/prize_digital_ocean.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_firebase.png b/app/assets/images/pages/play/ladder/prize_firebase.png
index 3aec861c6..49d2f2f88 100644
Binary files a/app/assets/images/pages/play/ladder/prize_firebase.png and b/app/assets/images/pages/play/ladder/prize_firebase.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_heap.png b/app/assets/images/pages/play/ladder/prize_heap.png
index 2770d0456..03bf8c5d0 100644
Binary files a/app/assets/images/pages/play/ladder/prize_heap.png and b/app/assets/images/pages/play/ladder/prize_heap.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_one_month.png b/app/assets/images/pages/play/ladder/prize_one_month.png
index be2942a09..b4e66fee4 100644
Binary files a/app/assets/images/pages/play/ladder/prize_one_month.png and b/app/assets/images/pages/play/ladder/prize_one_month.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_oreilly.png b/app/assets/images/pages/play/ladder/prize_oreilly.png
index f0430a695..354aab1d9 100644
Binary files a/app/assets/images/pages/play/ladder/prize_oreilly.png and b/app/assets/images/pages/play/ladder/prize_oreilly.png differ
diff --git a/app/assets/images/pages/play/ladder/prize_webstorm.png b/app/assets/images/pages/play/ladder/prize_webstorm.png
index dba0a30dc..a8f06ea0a 100644
Binary files a/app/assets/images/pages/play/ladder/prize_webstorm.png and b/app/assets/images/pages/play/ladder/prize_webstorm.png differ
diff --git a/app/assets/images/pages/play/ladder/warmup_button.png b/app/assets/images/pages/play/ladder/warmup_button.png
index ccc6503b2..707414699 100644
Binary files a/app/assets/images/pages/play/ladder/warmup_button.png and b/app/assets/images/pages/play/ladder/warmup_button.png differ
diff --git a/app/assets/images/pages/play/level-banner-complete.png b/app/assets/images/pages/play/level-banner-complete.png
index 4ea601195..282fb1f96 100644
Binary files a/app/assets/images/pages/play/level-banner-complete.png and b/app/assets/images/pages/play/level-banner-complete.png differ
diff --git a/app/assets/images/pages/play/level-banner-started.png b/app/assets/images/pages/play/level-banner-started.png
index c84d89526..841f02fd2 100644
Binary files a/app/assets/images/pages/play/level-banner-started.png and b/app/assets/images/pages/play/level-banner-started.png differ
diff --git a/app/assets/images/pages/play/level-info-background.png b/app/assets/images/pages/play/level-info-background.png
index 6b4c847ee..3857532ae 100644
Binary files a/app/assets/images/pages/play/level-info-background.png and b/app/assets/images/pages/play/level-info-background.png differ
diff --git a/app/assets/images/pages/play/level-info-status-spritesheet.png b/app/assets/images/pages/play/level-info-status-spritesheet.png
index 1f6b1f30c..93b808192 100644
Binary files a/app/assets/images/pages/play/level-info-status-spritesheet.png and b/app/assets/images/pages/play/level-info-status-spritesheet.png differ
diff --git a/app/assets/images/pages/play/level/modal/reward_icon_gems.png b/app/assets/images/pages/play/level/modal/reward_icon_gems.png
index 3cdc24894..65c4940b1 100644
Binary files a/app/assets/images/pages/play/level/modal/reward_icon_gems.png and b/app/assets/images/pages/play/level/modal/reward_icon_gems.png differ
diff --git a/app/assets/images/pages/play/level/modal/reward_icon_xp.png b/app/assets/images/pages/play/level/modal/reward_icon_xp.png
index 3644b1fe9..ac42cbb62 100644
Binary files a/app/assets/images/pages/play/level/modal/reward_icon_xp.png and b/app/assets/images/pages/play/level/modal/reward_icon_xp.png differ
diff --git a/app/assets/images/pages/play/level/modal/reward_plate.png b/app/assets/images/pages/play/level/modal/reward_plate.png
index 0a0a7b6e7..d6d5592ae 100644
Binary files a/app/assets/images/pages/play/level/modal/reward_plate.png and b/app/assets/images/pages/play/level/modal/reward_plate.png differ
diff --git a/app/assets/images/pages/play/level/modal/reward_plate_wide.png b/app/assets/images/pages/play/level/modal/reward_plate_wide.png
index d99ae8fac..426b770f4 100644
Binary files a/app/assets/images/pages/play/level/modal/reward_plate_wide.png and b/app/assets/images/pages/play/level/modal/reward_plate_wide.png differ
diff --git a/app/assets/images/pages/play/level/modal/victory_hero.png b/app/assets/images/pages/play/level/modal/victory_hero.png
index 068af4688..fcff611a2 100644
Binary files a/app/assets/images/pages/play/level/modal/victory_hero.png and b/app/assets/images/pages/play/level/modal/victory_hero.png differ
diff --git a/app/assets/images/pages/play/level/modal/victory_modal_background.png b/app/assets/images/pages/play/level/modal/victory_modal_background.png
index 7ed30bcb4..8b6270488 100644
Binary files a/app/assets/images/pages/play/level/modal/victory_modal_background.png and b/app/assets/images/pages/play/level/modal/victory_modal_background.png differ
diff --git a/app/assets/images/pages/play/level/modal/victory_modal_border_background.png b/app/assets/images/pages/play/level/modal/victory_modal_border_background.png
index 00657032c..f9ea8eaa9 100644
Binary files a/app/assets/images/pages/play/level/modal/victory_modal_border_background.png and b/app/assets/images/pages/play/level/modal/victory_modal_border_background.png differ
diff --git a/app/assets/images/pages/play/level/modal/victory_modal_shelf.png b/app/assets/images/pages/play/level/modal/victory_modal_shelf.png
index bd8586443..f9c38e066 100644
Binary files a/app/assets/images/pages/play/level/modal/victory_modal_shelf.png and b/app/assets/images/pages/play/level/modal/victory_modal_shelf.png differ
diff --git a/app/assets/images/pages/play/level/modal/victory_word.png b/app/assets/images/pages/play/level/modal/victory_word.png
index 0ead423a1..4e5995f2c 100644
Binary files a/app/assets/images/pages/play/level/modal/victory_word.png and b/app/assets/images/pages/play/level/modal/victory_word.png differ
diff --git a/app/assets/images/pages/play/level/modal/xp_gems_parchment.png b/app/assets/images/pages/play/level/modal/xp_gems_parchment.png
index 917db106f..f41be971a 100644
Binary files a/app/assets/images/pages/play/level/modal/xp_gems_parchment.png and b/app/assets/images/pages/play/level/modal/xp_gems_parchment.png differ
diff --git a/app/assets/images/pages/play/menu_icons.png b/app/assets/images/pages/play/menu_icons.png
index 37cd5fc03..585e52c88 100644
Binary files a/app/assets/images/pages/play/menu_icons.png and b/app/assets/images/pages/play/menu_icons.png differ
diff --git a/app/assets/images/pages/play/modal/buy-gems-background.png b/app/assets/images/pages/play/modal/buy-gems-background.png
index 59b61d07f..1c82ffe17 100644
Binary files a/app/assets/images/pages/play/modal/buy-gems-background.png and b/app/assets/images/pages/play/modal/buy-gems-background.png differ
diff --git a/app/assets/images/pages/play/modal/confirm-button.png b/app/assets/images/pages/play/modal/confirm-button.png
index 73c02f19d..21bf7b0a4 100644
Binary files a/app/assets/images/pages/play/modal/confirm-button.png and b/app/assets/images/pages/play/modal/confirm-button.png differ
diff --git a/app/assets/images/pages/play/modal/equip-buttons.png b/app/assets/images/pages/play/modal/equip-buttons.png
index 0c3eaf15b..397e9b0ec 100644
Binary files a/app/assets/images/pages/play/modal/equip-buttons.png and b/app/assets/images/pages/play/modal/equip-buttons.png differ
diff --git a/app/assets/images/pages/play/modal/game-menu-background.png b/app/assets/images/pages/play/modal/game-menu-background.png
index aa7a5ec28..f5d57b832 100644
Binary files a/app/assets/images/pages/play/modal/game-menu-background.png and b/app/assets/images/pages/play/modal/game-menu-background.png differ
diff --git a/app/assets/images/pages/play/modal/hero-portrait-selected.png b/app/assets/images/pages/play/modal/hero-portrait-selected.png
index a1c2cfebb..73209948e 100644
Binary files a/app/assets/images/pages/play/modal/hero-portrait-selected.png and b/app/assets/images/pages/play/modal/hero-portrait-selected.png differ
diff --git a/app/assets/images/pages/play/modal/hero-portrait.png b/app/assets/images/pages/play/modal/hero-portrait.png
index 49b79c1b0..21f08d200 100644
Binary files a/app/assets/images/pages/play/modal/hero-portrait.png and b/app/assets/images/pages/play/modal/hero-portrait.png differ
diff --git a/app/assets/images/pages/play/modal/heroes-background.png b/app/assets/images/pages/play/modal/heroes-background.png
index 612dbfda6..89e0bc56b 100644
Binary files a/app/assets/images/pages/play/modal/heroes-background.png and b/app/assets/images/pages/play/modal/heroes-background.png differ
diff --git a/app/assets/images/pages/play/modal/hr.png b/app/assets/images/pages/play/modal/hr.png
index 47ed3904f..f8a351b46 100644
Binary files a/app/assets/images/pages/play/modal/hr.png and b/app/assets/images/pages/play/modal/hr.png differ
diff --git a/app/assets/images/pages/play/modal/inventory-background.png b/app/assets/images/pages/play/modal/inventory-background.png
index 9217b51d9..b052d524e 100644
Binary files a/app/assets/images/pages/play/modal/inventory-background.png and b/app/assets/images/pages/play/modal/inventory-background.png differ
diff --git a/app/assets/images/pages/play/modal/item-box-background-selected.png b/app/assets/images/pages/play/modal/item-box-background-selected.png
index a32e32596..105b0192b 100644
Binary files a/app/assets/images/pages/play/modal/item-box-background-selected.png and b/app/assets/images/pages/play/modal/item-box-background-selected.png differ
diff --git a/app/assets/images/pages/play/modal/item-box-background.png b/app/assets/images/pages/play/modal/item-box-background.png
index 11ea27c2c..cf504f5d1 100644
Binary files a/app/assets/images/pages/play/modal/item-box-background.png and b/app/assets/images/pages/play/modal/item-box-background.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-accessories.png b/app/assets/images/pages/play/modal/item-icon-accessories.png
index 07c321f5b..82b083fa9 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-accessories.png and b/app/assets/images/pages/play/modal/item-icon-accessories.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-armor.png b/app/assets/images/pages/play/modal/item-icon-armor.png
index 0be834a85..6b20e288c 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-armor.png and b/app/assets/images/pages/play/modal/item-icon-armor.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-books.png b/app/assets/images/pages/play/modal/item-icon-books.png
index 2f60882bd..bc63f218a 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-books.png and b/app/assets/images/pages/play/modal/item-icon-books.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-misc.png b/app/assets/images/pages/play/modal/item-icon-misc.png
index 4a1240b83..964a06c85 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-misc.png and b/app/assets/images/pages/play/modal/item-icon-misc.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-primary.png b/app/assets/images/pages/play/modal/item-icon-primary.png
index f6348d4ae..cac3d8460 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-primary.png and b/app/assets/images/pages/play/modal/item-icon-primary.png differ
diff --git a/app/assets/images/pages/play/modal/item-icon-secondary.png b/app/assets/images/pages/play/modal/item-icon-secondary.png
index 616588e41..740c0b00a 100644
Binary files a/app/assets/images/pages/play/modal/item-icon-secondary.png and b/app/assets/images/pages/play/modal/item-icon-secondary.png differ
diff --git a/app/assets/images/pages/play/modal/items-background-narrow.png b/app/assets/images/pages/play/modal/items-background-narrow.png
index facca4861..b6e0fcb03 100644
Binary files a/app/assets/images/pages/play/modal/items-background-narrow.png and b/app/assets/images/pages/play/modal/items-background-narrow.png differ
diff --git a/app/assets/images/pages/play/modal/items-background.png b/app/assets/images/pages/play/modal/items-background.png
index 991b1eaa2..81c8d8607 100644
Binary files a/app/assets/images/pages/play/modal/items-background.png and b/app/assets/images/pages/play/modal/items-background.png differ
diff --git a/app/assets/images/pages/play/modal/k-means.gif b/app/assets/images/pages/play/modal/k-means.gif
index 862df3aa1..d16608e72 100644
Binary files a/app/assets/images/pages/play/modal/k-means.gif and b/app/assets/images/pages/play/modal/k-means.gif differ
diff --git a/app/assets/images/pages/play/modal/leaderboard-background.png b/app/assets/images/pages/play/modal/leaderboard-background.png
index 28d3a8260..4a9182831 100644
Binary files a/app/assets/images/pages/play/modal/leaderboard-background.png and b/app/assets/images/pages/play/modal/leaderboard-background.png differ
diff --git a/app/assets/images/pages/play/modal/menu-tab-selected.png b/app/assets/images/pages/play/modal/menu-tab-selected.png
index fbef30685..a6cc079d8 100644
Binary files a/app/assets/images/pages/play/modal/menu-tab-selected.png and b/app/assets/images/pages/play/modal/menu-tab-selected.png differ
diff --git a/app/assets/images/pages/play/modal/menu-tab.png b/app/assets/images/pages/play/modal/menu-tab.png
index 185a47d6a..76cbb0830 100644
Binary files a/app/assets/images/pages/play/modal/menu-tab.png and b/app/assets/images/pages/play/modal/menu-tab.png differ
diff --git a/app/assets/images/pages/play/modal/parental_nudge_wizard.png b/app/assets/images/pages/play/modal/parental_nudge_wizard.png
index cf98ead1a..75212ee3a 100644
Binary files a/app/assets/images/pages/play/modal/parental_nudge_wizard.png and b/app/assets/images/pages/play/modal/parental_nudge_wizard.png differ
diff --git a/app/assets/images/pages/play/modal/parental_prompt_modal_background.png b/app/assets/images/pages/play/modal/parental_prompt_modal_background.png
index bab86a3ca..3cf40b992 100644
Binary files a/app/assets/images/pages/play/modal/parental_prompt_modal_background.png and b/app/assets/images/pages/play/modal/parental_prompt_modal_background.png differ
diff --git a/app/assets/images/pages/play/modal/random-gems-background.png b/app/assets/images/pages/play/modal/random-gems-background.png
index 6ca966d12..dd7899fdf 100644
Binary files a/app/assets/images/pages/play/modal/random-gems-background.png and b/app/assets/images/pages/play/modal/random-gems-background.png differ
diff --git a/app/assets/images/pages/play/modal/subscribe-background-blank.png b/app/assets/images/pages/play/modal/subscribe-background-blank.png
index 8c13a3534..86e46fecd 100644
Binary files a/app/assets/images/pages/play/modal/subscribe-background-blank.png and b/app/assets/images/pages/play/modal/subscribe-background-blank.png differ
diff --git a/app/assets/images/pages/play/modal/subscribe-background.png b/app/assets/images/pages/play/modal/subscribe-background.png
index eab6b42ac..2c2a503f2 100644
Binary files a/app/assets/images/pages/play/modal/subscribe-background.png and b/app/assets/images/pages/play/modal/subscribe-background.png differ
diff --git a/app/assets/images/pages/play/modal/subscribe-gems.png b/app/assets/images/pages/play/modal/subscribe-gems.png
index 9f22df75c..bb1d3ab95 100644
Binary files a/app/assets/images/pages/play/modal/subscribe-gems.png and b/app/assets/images/pages/play/modal/subscribe-gems.png differ
diff --git a/app/assets/images/pages/play/modal/subscribe-heroes.png b/app/assets/images/pages/play/modal/subscribe-heroes.png
index bd55cf02b..852062fd5 100644
Binary files a/app/assets/images/pages/play/modal/subscribe-heroes.png and b/app/assets/images/pages/play/modal/subscribe-heroes.png differ
diff --git a/app/assets/images/pages/play/play-spritesheet.png b/app/assets/images/pages/play/play-spritesheet.png
index 7d40446b5..f0c78f2ca 100644
Binary files a/app/assets/images/pages/play/play-spritesheet.png and b/app/assets/images/pages/play/play-spritesheet.png differ
diff --git a/app/assets/images/pages/play/portal-background.png b/app/assets/images/pages/play/portal-background.png
index 4a9d33933..0a774aab1 100644
Binary files a/app/assets/images/pages/play/portal-background.png and b/app/assets/images/pages/play/portal-background.png differ
diff --git a/app/assets/images/pages/play/portal-campaigns.png b/app/assets/images/pages/play/portal-campaigns.png
index 3d9806dd1..ce26f1633 100644
Binary files a/app/assets/images/pages/play/portal-campaigns.png and b/app/assets/images/pages/play/portal-campaigns.png differ
diff --git a/app/assets/images/pages/sales/chat_icon.png b/app/assets/images/pages/sales/chat_icon.png
index 82cf47824..2070f59e9 100644
Binary files a/app/assets/images/pages/sales/chat_icon.png and b/app/assets/images/pages/sales/chat_icon.png differ
diff --git a/app/assets/images/pages/sales/classroom1.png b/app/assets/images/pages/sales/classroom1.png
index d742252dc..78d654d0a 100644
Binary files a/app/assets/images/pages/sales/classroom1.png and b/app/assets/images/pages/sales/classroom1.png differ
diff --git a/app/assets/images/pages/sales/classroom2.png b/app/assets/images/pages/sales/classroom2.png
index 8a2834b52..79c15941b 100644
Binary files a/app/assets/images/pages/sales/classroom2.png and b/app/assets/images/pages/sales/classroom2.png differ
diff --git a/app/assets/images/pages/sales/classroom3.png b/app/assets/images/pages/sales/classroom3.png
index cce4cd068..5669e0259 100644
Binary files a/app/assets/images/pages/sales/classroom3.png and b/app/assets/images/pages/sales/classroom3.png differ
diff --git a/app/assets/images/pages/sales/classroom4.png b/app/assets/images/pages/sales/classroom4.png
index 89e75b3fc..e1c64a7b0 100644
Binary files a/app/assets/images/pages/sales/classroom4.png and b/app/assets/images/pages/sales/classroom4.png differ
diff --git a/app/assets/images/pages/sales/classroom5.png b/app/assets/images/pages/sales/classroom5.png
index 6de5927cb..75752cda1 100644
Binary files a/app/assets/images/pages/sales/classroom5.png and b/app/assets/images/pages/sales/classroom5.png differ
diff --git a/app/assets/images/pages/sales/classroom6.png b/app/assets/images/pages/sales/classroom6.png
index 723d27337..05d42a441 100644
Binary files a/app/assets/images/pages/sales/classroom6.png and b/app/assets/images/pages/sales/classroom6.png differ
diff --git a/app/assets/images/pages/sales/content_table.png b/app/assets/images/pages/sales/content_table.png
index d10574807..a60fa0a2f 100644
Binary files a/app/assets/images/pages/sales/content_table.png and b/app/assets/images/pages/sales/content_table.png differ
diff --git a/app/assets/images/pages/sales/down_arrow.png b/app/assets/images/pages/sales/down_arrow.png
index 2ebe8ef15..6e265ca35 100644
Binary files a/app/assets/images/pages/sales/down_arrow.png and b/app/assets/images/pages/sales/down_arrow.png differ
diff --git a/app/assets/images/pages/sales/hero_background.png b/app/assets/images/pages/sales/hero_background.png
index 1fde05f6a..cf819050f 100644
Binary files a/app/assets/images/pages/sales/hero_background.png and b/app/assets/images/pages/sales/hero_background.png differ
diff --git a/app/assets/images/pages/sales/quote1.png b/app/assets/images/pages/sales/quote1.png
index 3aa52f3af..6b106a7f5 100644
Binary files a/app/assets/images/pages/sales/quote1.png and b/app/assets/images/pages/sales/quote1.png differ
diff --git a/app/assets/images/pages/sales/quote2.png b/app/assets/images/pages/sales/quote2.png
index 19f66af11..f6399dea7 100644
Binary files a/app/assets/images/pages/sales/quote2.png and b/app/assets/images/pages/sales/quote2.png differ
diff --git a/app/assets/images/pages/sales/screen1.png b/app/assets/images/pages/sales/screen1.png
index b778b173a..85bb9827c 100644
Binary files a/app/assets/images/pages/sales/screen1.png and b/app/assets/images/pages/sales/screen1.png differ
diff --git a/app/assets/images/pages/sales/screen2.png b/app/assets/images/pages/sales/screen2.png
index 237d7673b..c6ef953fd 100644
Binary files a/app/assets/images/pages/sales/screen2.png and b/app/assets/images/pages/sales/screen2.png differ
diff --git a/app/assets/images/pages/user/adventurer.png b/app/assets/images/pages/user/adventurer.png
index 2729d87b8..78ef01d8d 100644
Binary files a/app/assets/images/pages/user/adventurer.png and b/app/assets/images/pages/user/adventurer.png differ
diff --git a/app/assets/images/pages/user/ambassador.png b/app/assets/images/pages/user/ambassador.png
index f30002b33..ce3acea91 100644
Binary files a/app/assets/images/pages/user/ambassador.png and b/app/assets/images/pages/user/ambassador.png differ
diff --git a/app/assets/images/pages/user/archmage.png b/app/assets/images/pages/user/archmage.png
index dad621ee0..49b1fbeb5 100644
Binary files a/app/assets/images/pages/user/archmage.png and b/app/assets/images/pages/user/archmage.png differ
diff --git a/app/assets/images/pages/user/artisan.png b/app/assets/images/pages/user/artisan.png
index 351b1eace..1f01b621e 100644
Binary files a/app/assets/images/pages/user/artisan.png and b/app/assets/images/pages/user/artisan.png differ
diff --git a/app/assets/images/pages/user/diplomat.png b/app/assets/images/pages/user/diplomat.png
index 76c1cb6a7..e7c59841f 100644
Binary files a/app/assets/images/pages/user/diplomat.png and b/app/assets/images/pages/user/diplomat.png differ
diff --git a/app/assets/images/pages/user/general.png b/app/assets/images/pages/user/general.png
index f57cf15d6..7217bfd28 100644
Binary files a/app/assets/images/pages/user/general.png and b/app/assets/images/pages/user/general.png differ
diff --git a/app/assets/images/pages/user/scribe.png b/app/assets/images/pages/user/scribe.png
index 8c19f22ba..2f9ee231b 100644
Binary files a/app/assets/images/pages/user/scribe.png and b/app/assets/images/pages/user/scribe.png differ
diff --git a/app/assets/images/twitter_icon.png b/app/assets/images/twitter_icon.png
index 61054bd30..ba4018b91 100644
Binary files a/app/assets/images/twitter_icon.png and b/app/assets/images/twitter_icon.png differ
diff --git a/app/collections/AchievementCollection.coffee b/app/collections/Achievements.coffee
similarity index 57%
rename from app/collections/AchievementCollection.coffee
rename to app/collections/Achievements.coffee
index d3bbe0343..a25a77a47 100644
--- a/app/collections/AchievementCollection.coffee
+++ b/app/collections/Achievements.coffee
@@ -4,3 +4,8 @@ Achievement = require 'models/Achievement'
 module.exports = class AchievementCollection extends CocoCollection
   url: '/db/achievement'
   model: Achievement
+  
+  fetchRelatedToLevel: (levelOriginal, options) ->
+    options = _.extend({data: {}}, options)
+    options.data.related = levelOriginal
+    @fetch(options)
diff --git a/app/collections/LevelSessions.coffee b/app/collections/LevelSessions.coffee
new file mode 100644
index 000000000..7f69e64fb
--- /dev/null
+++ b/app/collections/LevelSessions.coffee
@@ -0,0 +1,12 @@
+CocoCollection = require 'collections/CocoCollection'
+LevelSession = require 'models/LevelSession'
+
+module.exports = class LevelSessionCollection extends CocoCollection
+  url: '/db/level.session'
+  model: LevelSession
+
+  fetchForCourseInstance: (courseInstanceID, options) ->
+    options = _.extend({
+      url: "/db/course_instance/#{courseInstanceID}/my-course-level-sessions"
+    }, options)
+    @fetch(options)
diff --git a/app/collections/ThangTypes.coffee b/app/collections/ThangTypes.coffee
new file mode 100644
index 000000000..8dd041307
--- /dev/null
+++ b/app/collections/ThangTypes.coffee
@@ -0,0 +1,6 @@
+CocoCollection = require 'collections/CocoCollection'
+ThangType = require 'models/ThangType'
+
+module.exports = class ThangTypeCollection extends CocoCollection
+  url: '/db/thang.type'
+  model: ThangType
\ No newline at end of file
diff --git a/app/core/social-handlers/FacebookHandler.coffee b/app/core/social-handlers/FacebookHandler.coffee
index 9252bb151..d6cac7811 100644
--- a/app/core/social-handlers/FacebookHandler.coffee
+++ b/app/core/social-handlers/FacebookHandler.coffee
@@ -35,7 +35,9 @@ module.exports = FacebookHandler = class FacebookHandler extends CocoClass
     if @loggedIn
       @fetchMeForLogin()
     else
-      FB.login()
+      FB.login ((response) ->
+        console.log 'Received FB login response:', response
+      ), scope: 'email'
       @waitingForLogin = true
 
   fetchMeForLogin: ->
diff --git a/app/lib/LevelBus.coffee b/app/lib/LevelBus.coffee
index 2a796cb12..16a4e9b48 100644
--- a/app/lib/LevelBus.coffee
+++ b/app/lib/LevelBus.coffee
@@ -125,7 +125,7 @@ module.exports = class LevelBus extends Bus
 
   onWinnabilityUpdated: (e) ->
     return unless @onPoint() and e.winnable
-    return unless e.level.get('slug') in ['ace-of-coders']  # Mirror matches don't otherwise show victory, so we win here.
+    return unless e.level.get('slug') in ['ace-of-coders', 'elemental-wars']  # Mirror matches don't otherwise show victory, so we win here.
     return if @session.get('state')?.complete
     @onVictory()
 
diff --git a/app/lib/LevelSetupManager.coffee b/app/lib/LevelSetupManager.coffee
index 9e40444a1..a7cb843ba 100644
--- a/app/lib/LevelSetupManager.coffee
+++ b/app/lib/LevelSetupManager.coffee
@@ -64,7 +64,7 @@ module.exports = class LevelSetupManager extends CocoClass
       @session.set 'heroConfig', {"thangType":sorcerer,"inventory":{"misc-0":"53e2396a53457600003e3f0f","programming-book":"546e266e9df4a17d0d449be5","minion":"54eb5dbc49fa2d5c905ddf56","feet":"53e214f153457600003e3eab","right-hand":"54eab7f52b7506e891ca7202","left-hand":"5463758f3839c6e02811d30f","wrists":"54693797a2b1f53ce79443e9","gloves":"5469425ca2b1f53ce7944421","torso":"546d4a549df4a17d0d449a97","neck":"54693274a2b1f53ce79443c9","eyes":"546941fda2b1f53ce794441d","head":"546d4ca19df4a17d0d449abf"}}
       @onInventoryModalPlayClicked()
       return
-    if @level.get('slug') is 'ace-of-coders'
+    if @level.get('slug') in ['ace-of-coders', 'elemental-wars']
       goliath = '55e1a6e876cb0948c96af9f8'
       @session.set 'heroConfig', {"thangType":goliath,"inventory":{"eyes":"53eb99f41a100989a40ce46e","neck":"54693274a2b1f53ce79443c9","wrists":"54693797a2b1f53ce79443e9","feet":"546d4d8e9df4a17d0d449acd","minion":"54eb5bf649fa2d5c905ddf4a","programming-book":"557871261ff17fef5abee3ee"}}
       @onInventoryModalPlayClicked()
diff --git a/app/lib/surface/SingularSprite.coffee b/app/lib/surface/SingularSprite.coffee
index b1509d113..c136a5283 100644
--- a/app/lib/surface/SingularSprite.coffee
+++ b/app/lib/surface/SingularSprite.coffee
@@ -79,7 +79,6 @@ module.exports = class SingularSprite extends createjs.Sprite
         @baseScaleY *= @camera.y2x * 0.85
       else
         @baseScaleY *= @camera.y2x / 0.85
-      console.log 'it is a cliff!', actionName, @baseScaleX, @baseScaleY
     @currentAnimation = actionName
     return
 
diff --git a/app/styles/common/common.sass b/app/styles/common/common.sass
index 83b3e285f..b23b0654d 100644
--- a/app/styles/common/common.sass
+++ b/app/styles/common/common.sass
@@ -397,3 +397,21 @@ body > iframe[src^="https://apis.google.com"]
 // TODO: update Bootstrap, remove this
 .text-uppercase
   text-transform: uppercase
+
+  
+// Made for new victory modal as temp features. TODO: Replace with static art or make general, sprite versions
+.well-parchment
+  border: 2px solid #14110e
+  background: #c2b695
+  color: #282116
+
+.img-prize
+  border: 4px solid #fef9a3
+  padding: 2px
+  background: #693415
+  
+.label-banner
+  border: 2px solid #350f0d
+  background: #e6251c
+  color: white
+  padding: 0.0em 0.6em 0.1em
\ No newline at end of file
diff --git a/app/styles/play/level/modal/course-victory-modal.sass b/app/styles/play/level/modal/course-victory-modal.sass
new file mode 100644
index 000000000..eb6d9ab80
--- /dev/null
+++ b/app/styles/play/level/modal/course-victory-modal.sass
@@ -0,0 +1,72 @@
+@import "app/styles/mixins"
+@import "app/styles/bootstrap/variables"
+
+#course-victory-modal
+
+  //- Top-level modal container
+  .modal-dialog
+    margin-top: 0
+    padding-top: 0
+    width: 750px
+
+    .modal-content
+      position: relative
+      margin-top: -251px
+
+  //- Header
+
+  .background-wrapper
+    width: 750px
+    background: transparent
+    border: 0px solid transparent
+    border-style: solid
+    border-image: url("/images/pages/play/level/modal/victory_modal_border_background.png") 250 0 100 0 fill round
+    border-width: 250px 0 100px 0
+    border-radius: 12px
+
+  .modal-header
+    border: none
+    position: absolute
+    left: 0px
+    width: 100%
+    height: 134px
+    margin: 0
+    padding: 0
+    top: 74px
+
+    text-align: center
+    .well-parchment
+      display: inline-block
+      h1
+        color: inherit
+        margin: 0
+      
+    #close-modal
+      position: absolute
+      right: 174px
+      color: white
+      top: -15px
+      background: #ba1d00
+      padding: 6px 6px 3px
+
+  .modal-body
+    padding: 30px 20px 0
+    position: relative
+    top: 80px
+    margin-top: 80px
+    
+    .well-parchment
+      margin-top: 20px
+    
+  
+    
+  
+html.no-borderimage
+  #course-victory-modal
+    .modal-dialog
+      margin-top: 251px
+    .background-wrapper
+      border: 0
+      background: url("/images/pages/play/level/modal/victory_modal_background.png")
+      height: 713px
+
diff --git a/app/styles/play/level/modal/new-item-view.sass b/app/styles/play/level/modal/new-item-view.sass
new file mode 100644
index 000000000..9f9de1ff7
--- /dev/null
+++ b/app/styles/play/level/modal/new-item-view.sass
@@ -0,0 +1,5 @@
+#new-item-view
+
+  #item-header
+    margin: -5px
+    
\ No newline at end of file
diff --git a/app/styles/play/level/modal/progress-view.sass b/app/styles/play/level/modal/progress-view.sass
new file mode 100644
index 000000000..700933bc8
--- /dev/null
+++ b/app/styles/play/level/modal/progress-view.sass
@@ -0,0 +1,8 @@
+#progress-view
+  h1, h2, h3
+    margin-top: 0
+    color: black
+    margin-bottom: 5px
+    
+  p
+    margin-top: 30px
\ No newline at end of file
diff --git a/app/templates/admin/analytics.jade b/app/templates/admin/analytics.jade
index 87de02c12..bc9dc1ff9 100644
--- a/app/templates/admin/analytics.jade
+++ b/app/templates/admin/analytics.jade
@@ -35,6 +35,27 @@ block content
     h3 Active Users 90 days
     .active-users-chart.line-chart-container
 
+    h3 Furthest Course
+    .small Teacher: owner of a course instance
+    .small Student: member of a course instance (assigned to course)
+    .small For course instances created in last #{view.furthestCourseDayRange} days, not Single Player, hourOfCode != true
+    .small Counts are not summed.  I.e. a student or teacher only contributes to the count of one course.
+    if view.teacherCourseDistribution
+      table.table.table-striped.table-condensed
+        tr
+          th Course
+          th Teachers
+          th Students
+          th Avg students per teacher
+        each count, courseIndex in view.teacherCourseDistribution
+          tr
+            td= view.courses.models[courseIndex].get('name')
+            td= count
+            td= view.studentCourseDistribution[courseIndex] || 0
+            td= Math.round((view.studentCourseDistribution[courseIndex] || 0) / count)
+    else
+      div Loading ...
+
     h1 Active Classes
     table.table.table-striped.table-condensed
       tr
diff --git a/app/templates/admin/design-elements-view.jade b/app/templates/admin/design-elements-view.jade
index 9ad8d2bfe..5dcf7de48 100644
--- a/app/templates/admin/design-elements-view.jade
+++ b/app/templates/admin/design-elements-view.jade
@@ -204,6 +204,22 @@
           p.text-info Info text
           p.text-warning Warning text
           p.text-danger Danger text
+          
+    .col-sm-3
+      .panel.panel-default
+        .panel-heading
+          a#images.panel-title(href="#images") Images
+          
+        .panel-body
+          div Rounded
+          img.img-rounded(style="width: 140px" src="/images/pages/contribute/tile_adventurer.png")
+          div Circle
+          img.img-circle(style="width: 140px" src="/images/pages/contribute/tile_adventurer.png")
+          div Thumbnail
+          img.img-thumbnail(style="width: 140px" src="/images/pages/contribute/tile_adventurer.png")
+          div Prize
+          img.img-prize(style="width: 140px" src="/images/pages/contribute/adventurer.png")
+          
       
   h1 Bootstrap Components
   
@@ -290,6 +306,8 @@
           span.label.label-warning warning
           span.spr
           span.label.label-danger danger
+          span.spr
+          span.label.label-banner banner
           
     .col-sm-3
       .panel.panel-default
@@ -379,6 +397,7 @@
           .well Well!
           .well.well-lg Large well!
           .well.well-sm Small well!
+          .well.well-parchment Parchment well
             
   h1 Bootstrap JavaScript
 
diff --git a/app/templates/play/level/modal/course-victory-modal.jade b/app/templates/play/level/modal/course-victory-modal.jade
new file mode 100644
index 000000000..b6c381923
--- /dev/null
+++ b/app/templates/play/level/modal/course-victory-modal.jade
@@ -0,0 +1,4 @@
+.modal-dialog
+  .background-wrapper
+    .modal-content
+      .modal-body
diff --git a/app/templates/play/level/modal/new-item-view.jade b/app/templates/play/level/modal/new-item-view.jade
new file mode 100644
index 000000000..8101beb34
--- /dev/null
+++ b/app/templates/play/level/modal/new-item-view.jade
@@ -0,0 +1,19 @@
+.modal-header
+  #close-modal.well.well-sm.well-parchment(data-dismiss="modal")
+    span.glyphicon.glyphicon-remove
+  .well.well-sm.well-parchment
+    h1(data-i18n="play_level.victory_new_item")
+
+.modal-body
+  .container-fluid
+    .row
+      .col-sm-5.text-center
+        img.img-rounded.img-prize(src=view.item.getPortraitURL())
+        h3#item-header
+          #item-label.label.label-banner= i18n(view.item.attributes, 'name')
+      .col-sm-7
+        .well.well-parchment= i18n(view.item.attributes, 'description')
+
+    .row
+      .col-sm-3.col-sm-offset-9
+        button#continue-btn.btn.btn-illustrated.btn-primary.btn-block.btn-lg.text-uppercase Continue
\ No newline at end of file
diff --git a/app/templates/play/level/modal/progress-view.jade b/app/templates/play/level/modal/progress-view.jade
new file mode 100644
index 000000000..a1a787018
--- /dev/null
+++ b/app/templates/play/level/modal/progress-view.jade
@@ -0,0 +1,42 @@
+.modal-header
+  #close-modal.well.well-sm.well-parchment(data-dismiss="modal")
+    span.glyphicon.glyphicon-remove
+  .well.well-sm.well-parchment
+    h1 Level Complete
+
+.modal-body
+  .container-fluid
+    .row
+      - var colClass = view.nextLevel ? 'col-sm-7' : 'col-sm-12'
+      div(class=colClass)
+        .well.well-sm.well-parchment
+          h3.text-uppercase Completed Level:
+          h2.text-uppercase.text-center= i18n(view.level.attributes, 'name')
+        .well.well-sm.well-parchment
+          h3.text-uppercase Course:
+          .row
+            .col-sm-8
+              h3.text-uppercase.text-center= i18n(view.course.attributes, 'name')
+            .col-sm-4
+              - var stats = view.campaign.statsForSessions(view.levelSessions)
+              h1
+                span #{stats.levels.numDone}/#{stats.levels.size}
+          
+        
+      if view.nextLevel
+        .col-sm-5
+          .well.well-sm.well-parchment
+            h3.text-uppercase Next Level:
+            h2.text-uppercase= i18n(view.nextLevel.attributes, 'name')
+            
+            p= i18n(view.nextLevel.attributes, 'description')
+        
+    .row
+      .col-sm-5.col-sm-offset-2
+      // TODO: Add this and rest of campaign functionality
+      //  button#continue-btn.btn.btn-illustrated.btn-default.btn-block.btn-lg.text-uppercase View Leaderboards
+      .col-sm-5
+        if view.nextLevel
+          button#next-level-btn.btn.btn-illustrated.btn-primary.btn-block.btn-lg.text-uppercase Next Level
+        else
+          button#done-btn.btn.btn-illustrated.btn-primary.btn-block.btn-lg.text-uppercase Done
\ No newline at end of file
diff --git a/app/views/TeachersFreeTrialView.coffee b/app/views/TeachersFreeTrialView.coffee
index 346b0295c..8d389f1b4 100644
--- a/app/views/TeachersFreeTrialView.coffee
+++ b/app/views/TeachersFreeTrialView.coffee
@@ -25,6 +25,9 @@ module.exports = class TeachersFreeTrialView extends RootView
     @listenToOnce @existingRequests, 'sync', =>
       @fetchingData = false
       @render?()
+      existingRequest = @existingRequests.at(0)
+      if existingRequest?.get('status') isnt 'submitted' and existingRequest?.get('status') isnt 'approved'
+        window.tracker?.trackEvent 'View Trial Request', category: 'Teachers', label: 'View Trial Request', ['Mixpanel'] 
     @supermodel.loadCollection(@existingRequests, 'own_trial_requests', {cache: false})
 
   onClickTextBox: (e) ->
diff --git a/app/views/admin/AnalyticsView.coffee b/app/views/admin/AnalyticsView.coffee
index 17ea76eb0..64542d998 100644
--- a/app/views/admin/AnalyticsView.coffee
+++ b/app/views/admin/AnalyticsView.coffee
@@ -1,3 +1,6 @@
+CocoCollection = require 'collections/CocoCollection'
+Course = require 'models/Course'
+CourseInstance = require 'models/CourseInstance'
 require 'vendor/d3'
 d3Utils = require 'core/d3_utils'
 RootView = require 'views/core/RootView'
@@ -7,6 +10,7 @@ utils = require 'core/utils'
 module.exports = class AnalyticsView extends RootView
   id: 'admin-analytics-view'
   template: template
+  furthestCourseDayRange: 30
   lineColors: ['red', 'blue', 'green', 'purple', 'goldenrod', 'brown', 'darkcyan']
 
   constructor: (options) ->
@@ -114,6 +118,56 @@ module.exports = class AnalyticsView extends RootView
         @updateRevenueChartData()
         @render?()
     }, 0).load()
+    
+    @courses = new CocoCollection([], { url: "/db/course", model: Course})
+    @courses.comparator = "_id" 
+    @listenToOnce @courses, 'sync', @onCoursesSync
+    @supermodel.loadCollection(@courses, 'courses')
+
+  onCoursesSync: ->
+    # Assumes courses retrieved in order
+    @courseOrderMap = {}
+    @courseOrderMap[@courses.models[i].get('_id')] = i for i in [0...@courses.models.length]
+
+    startDay = new Date()
+    startDay.setUTCDate(startDay.getUTCDate() - @furthestCourseDayRange)
+    startDay = startDay.toISOString().substring(0, 10)
+    options =
+      url: '/db/course_instance/-/recent'
+      method: 'POST'
+      data: {startDay: startDay}
+    options.error = (models, response, options) =>
+      return if @destroyed
+      console.error 'Failed to get recent course instances', response
+    options.success = (models) =>
+      @courseInstances = models ? [] 
+      @onCourseInstancesSync()
+      @render?()
+    @supermodel.addRequestResource('get_recent_course_instances', options, 0).load()
+
+  onCourseInstancesSync: ->
+    return unless @courseInstances
+
+    # Find highest course for teachers and students
+    @teacherFurthestCourseMap = {}
+    @studentFurthestCourseMap = {}
+    for courseInstance in @courseInstances
+      courseID = courseInstance.courseID
+      teacherID = courseInstance.ownerID
+      if not @teacherFurthestCourseMap[teacherID] or @teacherFurthestCourseMap[teacherID] < @courseOrderMap[courseID]
+        @teacherFurthestCourseMap[teacherID] = @courseOrderMap[courseID]
+      for studentID in courseInstance.members
+        if not @studentFurthestCourseMap[studentID] or @studentFurthestCourseMap[studentID] < @courseOrderMap[courseID]
+          @studentFurthestCourseMap[studentID] = @courseOrderMap[courseID]
+
+    @teacherCourseDistribution = {}
+    for teacherID, courseIndex of @teacherFurthestCourseMap
+      @teacherCourseDistribution[courseIndex] ?= 0
+      @teacherCourseDistribution[courseIndex]++
+    @studentCourseDistribution = {}
+    for studentID, courseIndex of @studentFurthestCourseMap
+      @studentCourseDistribution[courseIndex] ?= 0
+      @studentCourseDistribution[courseIndex]++
 
   createLineChartPoints: (days, data) ->
     points = []
diff --git a/app/views/core/CocoView.coffee b/app/views/core/CocoView.coffee
index ea7d8c602..10fb9bc91 100644
--- a/app/views/core/CocoView.coffee
+++ b/app/views/core/CocoView.coffee
@@ -133,6 +133,7 @@ module.exports = class CocoView extends Backbone.View
     context.view = @
     context._ = _
     context.document = document
+    context.i18n = utils.i18n
     context
 
   afterRender: ->
diff --git a/app/views/ladder/MyMatchesTabView.coffee b/app/views/ladder/MyMatchesTabView.coffee
index 023c1b40b..78237e2e4 100644
--- a/app/views/ladder/MyMatchesTabView.coffee
+++ b/app/views/ladder/MyMatchesTabView.coffee
@@ -117,7 +117,7 @@ module.exports = class MyMatchesTabView extends CocoView
       placeholder = $(el)
       sessionID = placeholder.data('session-id')
       session = _.find @sessions.models, {id: sessionID}
-      if @level.get('slug') in ['ace-of-coders']
+      if @level.get('slug') in ['ace-of-coders', 'elemental-wars']
         mirrorSession = (s for s in @sessions.models when s.get('team') isnt session.get('team'))[0]
       ladderSubmissionView = new LadderSubmissionView session: session, level: @level, mirrorSession: mirrorSession
       @insertSubView ladderSubmissionView, placeholder
diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee
index aa581c10f..ac8af7888 100644
--- a/app/views/play/level/PlayLevelView.coffee
+++ b/app/views/play/level/PlayLevelView.coffee
@@ -36,6 +36,7 @@ GoldView = require './LevelGoldView'
 DuelStatsView = require './DuelStatsView'
 VictoryModal = require './modal/VictoryModal'
 HeroVictoryModal = require './modal/HeroVictoryModal'
+CourseVictoryModal = require './modal/CourseVictoryModal'
 InfiniteLoopModal = require './modal/InfiniteLoopModal'
 LevelSetupManager = require 'lib/LevelSetupManager'
 ContactModal = require 'views/core/ContactModal'
@@ -283,7 +284,7 @@ module.exports = class PlayLevelView extends RootView
       if e.session.get('creator') is '532dbc73a622924444b68ed9'  # Wizard Dude gets his own avatar
         sorcerer = '53e126a4e06b897606d38bef'
       e.session.set 'heroConfig', {"thangType":sorcerer,"inventory":{"misc-0":"53e2396a53457600003e3f0f","programming-book":"546e266e9df4a17d0d449be5","minion":"54eb5dbc49fa2d5c905ddf56","feet":"53e214f153457600003e3eab","right-hand":"54eab7f52b7506e891ca7202","left-hand":"5463758f3839c6e02811d30f","wrists":"54693797a2b1f53ce79443e9","gloves":"5469425ca2b1f53ce7944421","torso":"546d4a549df4a17d0d449a97","neck":"54693274a2b1f53ce79443c9","eyes":"546941fda2b1f53ce794441d","head":"546d4ca19df4a17d0d449abf"}}
-    else if e.level.get('slug') is 'ace-of-coders'
+    else if e.level.get('slug') in ['ace-of-coders', 'elemental-wars']
       goliath = '55e1a6e876cb0948c96af9f8'
       e.session.set 'heroConfig', {"thangType":goliath,"inventory":{"eyes":"53eb99f41a100989a40ce46e","neck":"54693274a2b1f53ce79443c9","wrists":"54693797a2b1f53ce79443e9","feet":"546d4d8e9df4a17d0d449acd","minion":"54eb5bf649fa2d5c905ddf4a","programming-book":"557871261ff17fef5abee3ee"}}
     else if e.level.get('slug') is 'assembly-speed'
@@ -533,6 +534,7 @@ module.exports = class PlayLevelView extends RootView
     @endHighlight()
     options = {level: @level, supermodel: @supermodel, session: @session, hasReceivedMemoryWarning: @hasReceivedMemoryWarning, courseID: @courseID, courseInstanceID: @courseInstanceID}
     ModalClass = if @level.get('type', true) in ['hero', 'hero-ladder', 'hero-coop', 'course', 'course-ladder'] then HeroVictoryModal else VictoryModal
+    ModalClass = CourseVictoryModal if @courseID and @courseInstanceID
     victoryModal = new ModalClass(options)
     @openModalView(victoryModal)
     if me.get('anonymous')
diff --git a/app/views/play/level/modal/CourseVictoryModal.coffee b/app/views/play/level/modal/CourseVictoryModal.coffee
new file mode 100644
index 000000000..6b63f0faa
--- /dev/null
+++ b/app/views/play/level/modal/CourseVictoryModal.coffee
@@ -0,0 +1,170 @@
+ModalView = require 'views/core/ModalView'
+template = require 'templates/play/level/modal/course-victory-modal'
+Achievements = require 'collections/Achievements'
+Level = require 'models/Level'
+Campaign = require 'models/Campaign'
+Course = require 'models/Course'
+ThangType = require 'models/ThangType'
+ThangTypes = require 'collections/ThangTypes'
+LevelSessions = require 'collections/LevelSessions'
+EarnedAchievement = require 'models/EarnedAchievement'
+LocalMongo = require 'lib/LocalMongo'
+ProgressView = require './ProgressView'
+NewItemView = require './NewItemView'
+
+module.exports = class CourseVictoryModal extends ModalView
+  id: 'course-victory-modal'
+  template: template
+  closesOnClickOutside: false
+
+  
+  initialize: (options) ->
+    @courseID = options.courseID
+    @courseInstanceID = options.courseInstanceID
+    @views = []
+
+    @session = options.session
+    @level = options.level
+    @newItems = new ThangTypes()
+    @newHeroes = new ThangTypes()
+    
+    @achievements = options.achievements
+    if not @achievements
+      @achievements = new Achievements()
+      @achievements.fetchRelatedToLevel(@session.get('level').original)
+      @achievements = @supermodel.loadCollection(@achievements, 'achievements').model
+      @listenToOnce @achievements, 'sync', @onAchievementsLoaded
+    else
+      @onAchievementsLoaded()
+    
+    @playSound 'victory'
+    @nextLevel = options.nextLevel
+    if (nextLevel = @level.get('nextLevel')) and not @nextLevel
+      @nextLevel = new Level().setURL "/db/level/#{nextLevel.original}/version/#{nextLevel.majorVersion}"
+      @nextLevel = @supermodel.loadModel(@nextLevel, 'level').model
+      
+    @campaign = new Campaign()
+    @course = options.course
+    if @courseID and not @course
+      @course = new Course().setURL "/db/course/#{@courseID}"
+      @course = @supermodel.loadModel(@course, 'course').model
+      if @course.loading
+        @listenToOnce @course, 'sync', @onCourseLoaded
+      else
+        @onCourseLoaded()
+    else if @course
+      @onCourseLoaded()
+
+    if @courseInstanceID
+      @levelSessions = new LevelSessions()
+      @levelSessions.fetchForCourseInstance(@courseInstanceID)
+      @levelSessions = @supermodel.loadCollection(@levelSessions, 'sessions', { 
+        data: { project: 'state.complete level.original playtime changed' }
+      }).model
+
+
+  onCourseLoaded: ->
+    @campaign.set('_id', @course.get('campaignID'))
+    @campaign = @supermodel.loadModel(@campaign, 'campaign').model
+
+      
+  onAchievementsLoaded: ->
+    @achievements.models = _.filter @achievements.models, (m) -> not m.get('query')?.ladderAchievementDifficulty  # Don't show higher AI difficulty achievements
+    itemOriginals = []
+    heroOriginals = []
+    achievementIDs = []
+    for achievement in @achievements.models
+      rewards = achievement.get('rewards') or {}
+      heroOriginals.push rewards.heroes or []
+      itemOriginals.push rewards.items or []
+      achievement.completed = LocalMongo.matchesQuery(@session.attributes, achievement.get('query'))
+      achievementIDs.push(achievement.id) if achievement.completed
+
+    itemOriginals = _.uniq _.flatten itemOriginals
+    heroOriginals = _.uniq _.flatten heroOriginals
+    #project = ['original', 'rasterIcon', 'name', 'soundTriggers', 'i18n']  # This is what we need, but the PlayHeroesModal needs more, and so we load more to fill up the supermodel.
+    project = ['original', 'rasterIcon', 'name', 'slug', 'soundTriggers', 'featureImages', 'gems', 'heroClass', 'description', 'components', 'extendedName', 'unlockLevelName', 'i18n']
+    for [newThangTypeCollection, originals] in [[@newItems, itemOriginals], [@newHeroes, heroOriginals]]
+      for original in originals
+        thang= new ThangType()
+        thang.url = "/db/thang.type/#{original}/version"
+        thang.project = project
+        @supermodel.loadModel(thang, 'thang')
+        newThangTypeCollection.add(thang)
+      
+    @newEarnedAchievements = []
+    for achievement in @achievements.models
+      continue unless achievement.completed
+      ea = new EarnedAchievement({
+        collection: achievement.get('collection')
+        triggeredBy: @session.id
+        achievement: achievement.id
+      })
+      ea.save()
+      # Can't just add models to supermodel because each ea has the same url
+      ea.sr = @supermodel.addSomethingResource(ea.cid)
+      @newEarnedAchievements.push ea
+      @listenToOnce ea, 'sync', (model) ->
+        model.sr.markLoaded()
+        if _.all((ea.id for ea in @newEarnedAchievements))
+          unless me.loading
+            @supermodel.loadModel(me, 'user', {cache: false})
+          @newEarnedAchievementsResource.markLoaded()
+
+    
+    # have to use a something resource because addModelResource doesn't handle models being upserted/fetched via POST like we're doing here
+    @newEarnedAchievementsResource = @supermodel.addSomethingResource('earned achievements') if @newEarnedAchievements.length
+
+  
+  onLoaded: ->
+    super()
+    @views = []
+    
+    # TODO: Add main victory view
+    # TODO: Add level up view
+    # TODO: Add new hero view?
+    
+    for newItem in @newItems.models
+      @views.push(new NewItemView({item: newItem}))
+    
+    progressView = new ProgressView({
+      level: @level
+      nextLevel: @nextLevel
+      course: @course
+      campaign: @campaign
+      levelSessions: @levelSessions
+    })
+    
+    progressView.once 'done', @onDone, @
+    progressView.once 'next-level', @onNextLevel, @
+    for view in @views
+      view.on 'continue', @onViewContinue, @
+    @views.push(progressView)
+    
+    @showView(_.first(@views))
+  
+  afterRender: ->
+    super()
+    @showView(@currentView)
+
+  showView: (view) ->
+    return unless view
+    view.setElement(@$('.modal-content'))
+    view.$el.attr('id', view.id)
+    view.$el.addClass(view.className)
+    view.render()
+    @currentView = view
+
+  onViewContinue: ->
+    index = _.indexOf(@views, @currentView)
+    @showView(@views[index+1])
+
+  onNextLevel: ->
+    link = "/play/level/#{@nextLevel.get('slug')}?course=#{@courseID}&course-instance=#{@courseInstanceID}"
+    application.router.navigate(link, {trigger: true})
+
+  onDone: ->
+    link = "/courses/#{@courseID}/#{@courseInstanceID}"
+    application.router.navigate(link, {trigger: true})
+    
+    
\ No newline at end of file
diff --git a/app/views/play/level/modal/NewItemView.coffee b/app/views/play/level/modal/NewItemView.coffee
new file mode 100644
index 000000000..e79864541
--- /dev/null
+++ b/app/views/play/level/modal/NewItemView.coffee
@@ -0,0 +1,20 @@
+CocoView = require 'views/core/CocoView'
+
+module.exports = class NewItemView extends CocoView
+  id: 'new-item-view'
+  className: 'modal-content' 
+  template: require('templates/play/level/modal/new-item-view')
+  
+  events:
+    'click #continue-btn': 'onClickContinueButton'
+    
+  afterRender: ->
+    super()
+    # TODO: Animate icon
+    
+  initialize: (options) ->
+    @item = options.item
+    super()
+
+  onClickContinueButton: ->
+    @trigger 'continue'
\ No newline at end of file
diff --git a/app/views/play/level/modal/ProgressView.coffee b/app/views/play/level/modal/ProgressView.coffee
new file mode 100644
index 000000000..ba0e5e1c7
--- /dev/null
+++ b/app/views/play/level/modal/ProgressView.coffee
@@ -0,0 +1,24 @@
+CocoView = require 'views/core/CocoView'
+
+module.exports = class ProgressView extends CocoView
+  
+  id: 'progress-view'
+  className: 'modal-content'
+  template: require 'templates/play/level/modal/progress-view'
+
+  events:
+    'click #done-btn': 'onClickDoneButton'
+    'click #next-level-btn': 'onClickNextLevelButton'
+
+  initialize: (options) ->
+    @level = options.level
+    @course = options.course
+    @nextLevel = options.nextLevel
+    @campaign = options.campaign
+    @levelSessions = options.levelSessions
+
+  onClickDoneButton: ->
+    @trigger 'done'
+
+  onClickNextLevelButton: ->
+    @trigger 'next-level'
\ No newline at end of file
diff --git a/app/views/play/level/tome/CastButtonView.coffee b/app/views/play/level/tome/CastButtonView.coffee
index 5ec22690d..251484f8d 100644
--- a/app/views/play/level/tome/CastButtonView.coffee
+++ b/app/views/play/level/tome/CastButtonView.coffee
@@ -31,7 +31,7 @@ module.exports = class CastButtonView extends CocoView
     @castShortcut = '⇧↵'
     @updateReplayabilityInterval = setInterval @updateReplayability, 1000
     @observing = options.session.get('creator') isnt me.id
-    @loadMirrorSession() if @options.level.get('slug') in ['ace-of-coders']
+    @loadMirrorSession() if @options.level.get('slug') in ['ace-of-coders', 'elemental-wars']
     @autoSubmitsToLadder = @options.level.get('slug') in ['wakka-maul']
 
   destroy: ->
diff --git a/app/views/play/menu/GameMenuModal.coffee b/app/views/play/menu/GameMenuModal.coffee
index 1f0238c3c..6ac4f54bf 100644
--- a/app/views/play/menu/GameMenuModal.coffee
+++ b/app/views/play/menu/GameMenuModal.coffee
@@ -34,7 +34,7 @@ module.exports = class GameMenuModal extends ModalView
     submenus = ['guide', 'options', 'save-load', 'multiplayer']
     submenus = _.without submenus, 'guide' unless docs.specificArticles?.length or docs.generalArticles?.length
     submenus = _.without submenus, 'save-load' unless me.isAdmin() or /https?:\/\/localhost/.test(window.location.href)
-    submenus = _.without submenus, 'multiplayer' unless me.isAdmin() or (@level?.get('type') in ['ladder', 'hero-ladder', 'course-ladder'] and @level.get('slug') not in ['ace-of-coders'])
+    submenus = _.without submenus, 'multiplayer' unless me.isAdmin() or (@level?.get('type') in ['ladder', 'hero-ladder', 'course-ladder'] and @level.get('slug') not in ['ace-of-coders', 'elemental-wars'])
     @includedSubmenus = submenus
     context.showTab = @options.showTab ? submenus[0]
     context.submenus = submenus
@@ -47,7 +47,7 @@ module.exports = class GameMenuModal extends ModalView
 
   showsChooseHero: ->
     return false if @level?.get('type') in ['course', 'course-ladder']
-    return false if @options.levelID in ['zero-sum', 'ace-of-coders']
+    return false if @options.levelID in ['zero-sum', 'ace-of-coders', 'elemental-wars']
     return true
 
   afterRender: ->
diff --git a/scripts/analytics/mongodb/queries/exportTrialRequests.js b/scripts/analytics/mongodb/queries/exportTrialRequests.js
new file mode 100644
index 000000000..44624a858
--- /dev/null
+++ b/scripts/analytics/mongodb/queries/exportTrialRequests.js
@@ -0,0 +1,11 @@
+// Latest approved teacher trial requests
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+var requests = db.trial.requests.find().toArray();
+function format(r) { 
+  var p = r.properties;
+  return [r.created.getFullYear() + '-' + (r.created.getMonth() + 1) + '-' + r.created.getDate(), r.status, r.type, p.email, p.school, p.location, p.age, p.numStudents, p.heardAbout].join('\t').replace(/[\n\r]/g, '     ');
+}
+print(requests.map(format).join('\n'));
diff --git a/server/courses/course_instance_handler.coffee b/server/courses/course_instance_handler.coffee
index e28bf2835..374a5e358 100644
--- a/server/courses/course_instance_handler.coffee
+++ b/server/courses/course_instance_handler.coffee
@@ -11,6 +11,7 @@ PrepaidHandler = require '../prepaids/prepaid_handler'
 User = require '../users/User'
 UserHandler = require '../users/user_handler'
 utils = require '../../app/core/utils'
+{objectIdFromTimestamp} = require '../lib/utils'
 sendwithus = require '../sendwithus'
 mongoose = require 'mongoose'
 
@@ -38,6 +39,7 @@ CourseInstanceHandler = class CourseInstanceHandler extends Handler
     return @removeMember(req, res, args[0]) if req.method is 'DELETE' and args[1] is 'members'
     return @getMembersAPI(req, res, args[0]) if args[1] is 'members'
     return @inviteStudents(req, res, args[0]) if relationship is 'invite_students'
+    return @getRecentAPI(req, res) if relationship is 'recent'
     return @redeemPrepaidCodeAPI(req, res) if args[1] is 'redeem_prepaid'
     return @getMyCourseLevelSessionsAPI(req, res, args[0]) if args[1] is 'my-course-level-sessions'
     return @findByLevel(req, res, args[2]) if args[1] is 'find_by_level'
@@ -193,6 +195,15 @@ CourseInstanceHandler = class CourseInstanceHandler extends Handler
         cleandocs = (UserHandler.formatEntity(req, doc) for doc in users)
         @sendSuccess(res, cleandocs)
 
+  getRecentAPI: (req, res) ->
+    return @sendUnauthorizedError(res) unless req.user?.isAdmin()
+    query = {$and: [{name: {$ne: 'Single Player'}}, {hourOfCode: {$ne: true}}]}
+    query["$and"].push(_id: {$gte: objectIdFromTimestamp(req.body.startDay + "T00:00:00.000Z")}) if req.body.startDay?
+    query["$and"].push(_id: {$lt: objectIdFromTimestamp(req.body.endDay + "T00:00:00.000Z")}) if req.body.endDay?
+    CourseInstance.find query, (err, courseInstances) =>
+      return @sendDatabaseError(res, err) if err
+      @sendSuccess(res, courseInstances)
+
   inviteStudents: (req, res, courseInstanceID) ->
     return @sendUnauthorizedError(res) if not req.user?
     if not req.body.emails
diff --git a/test/app/views/play/level/modal/CourseVictoryModal.fixtures.coffee b/test/app/views/play/level/modal/CourseVictoryModal.fixtures.coffee
new file mode 100644
index 000000000..e7faee7af
--- /dev/null
+++ b/test/app/views/play/level/modal/CourseVictoryModal.fixtures.coffee
@@ -0,0 +1,1477 @@
+module.exports = {
+  achievements: [
+    {
+      "_id": "541a23431ccc8eaae19f3bf6",
+      "slug": "gems-in-the-deep-completed",
+      "related": "54173c90844506ae0195a0b4",
+      "userField": "creator",
+      "description": "You completed Gems in the Deep.",
+      "collection": "level.sessions",
+      "query": {
+        "state.complete": true,
+        "level.original": "54173c90844506ae0195a0b4"
+      },
+      "name": "Gems in the Deep Completed",
+      "__v": 32,
+      "rewards": {
+        "levels": [
+          "54174347844506ae0195a0b8"
+        ],
+        "gems": 18
+#        "items":[
+#          "53e4108204c00d4607a89f78"
+#        ]
+      },
+      "worth": 11,
+      "i18n": {},
+      "i18nCoverage": [],
+      "patches": []
+    },
+    {
+      "_id": "5452e14006a59e000067e501",
+      "slug": "gems-in-the-deep-clean-code",
+      "i18nCoverage": [],
+      "i18n": {},
+      "related": "54173c90844506ae0195a0b4",
+      "userField": "creator",
+      "description": "Clean code: no code errors or warnings.",
+      "collection": "level.sessions",
+      "query": {
+        "level.original": "54173c90844506ae0195a0b4",
+        "state.goalStates.clean-code.status": "success",
+        "state.complete": true
+      },
+      "name": "Gems in the Deep Clean Code",
+      "__v": 29,
+      "rewards": {
+        "gems": 9
+      },
+      "worth": 5,
+      "patches": []
+    }
+  ]
+  
+  
+  campaign: {
+    "_id": "55b29efd1cd6abe8ce07db0d",
+    "slug": "intro",
+    "name": "Intro",
+    "watchers": [
+      "512ef4805a67a8c507000001"
+    ],
+    "__v": 30,
+    "adjacentCampaigns": {
+      "549f0801e21e041139ef28c8": {
+        "name": "Forest",
+        "slug": "forest",
+        "position": {
+          "x": 94.5,
+          "y": 7
+        },
+        "rotation": -35,
+        "color": "purple",
+        "showIfUnlocked": "541b67f71ccc8eaae19f3c62",
+        "i18n": {}
+      }
+    },
+    "ambientSound": {
+      "mp3": "db/campaign/549f07f7e21e041139ef28c7/ambient-dungeon.mp3",
+      "ogg": "db/campaign/549f07f7e21e041139ef28c7/ambient-dungeon.ogg"
+    },
+    "backgroundColor": "rgba(68, 54, 45, 1)",
+    "backgroundColorTransparent": "rgba(68, 54, 45, 0)",
+    "backgroundImage": [
+      {
+        "image": "db/campaign/549f07f7e21e041139ef28c7/map_dungeon_1920.jpg",
+        "width": 1920
+      },
+      {
+        "image": "db/campaign/549f07f7e21e041139ef28c7/map_dungeon_1366.jpg",
+        "width": 1366
+      }
+    ],
+    "description": "1 hour: syntax, methods, parameters, strings, loops, variables",
+    "fullName": "Introduction to Computer Science",
+    "i18n": {},
+    "i18nCoverage": [],
+    "levels": {
+      "5411cb3769152f1707be029c": {
+        "campaignIndex": 0,
+        "rewards": [
+          {
+            "achievement": "541a198a1ccc8eaae19f3be4",
+            "level": "54173c90844506ae0195a0b4"
+          },
+          {
+            "achievement": "541a198a1ccc8eaae19f3be4",
+            "level": "55525bcaaf92058705a94c02"
+          }
+        ],
+        "name": "Dungeons of Kithgard",
+        "description": "Grab the gem, but touch nothing else. In this level you'll learn basic movement for your hero.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "dungeons-of-kithgard",
+        "original": "5411cb3769152f1707be029c",
+        "disableSpaces": 3,
+        "hidesSubmitUntilRun": true,
+        "hidesPlayButton": true,
+        "hidesRunShortcut": true,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "requiredCode": [
+          "moveRight"
+        ],
+        "requiredGear": {},
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax"
+        ],
+        "position": {
+          "x": 19.209888199437682,
+          "y": 12.51725346209055
+        }
+      },
+      "54173c90844506ae0195a0b4": {
+        "position": {
+          "y": 12.117739757859558,
+          "x": 28.059445721561577
+        },
+        "concepts": [
+          "basic_syntax"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "hidesRunShortcut": true,
+        "hidesPlayButton": true,
+        "hidesSubmitUntilRun": true,
+        "disableSpaces": 4,
+        "original": "54173c90844506ae0195a0b4",
+        "slug": "gems-in-the-deep",
+        "type": "hero",
+        "i18n": {},
+        "description": "Quickly collect the gems; you will need them.",
+        "name": "Gems in the Deep",
+        "rewards": [
+          {
+            "achievement": "541a23431ccc8eaae19f3bf6",
+            "level": "54174347844506ae0195a0b8"
+          }
+        ],
+        "campaignIndex": 1
+      },
+      "54174347844506ae0195a0b8": {
+        "campaignIndex": 2,
+        "rewards": [
+          {
+            "achievement": "54253cfb5d84cd00002e7f62",
+            "level": "544a98f62d002f0000fe331a"
+          },
+          {
+            "achievement": "54253cfb5d84cd00002e7f62",
+            "level": "54cfc6e2d06e8152051eb8a4"
+          }
+        ],
+        "name": "Shadow Guard",
+        "description": "Evade the ogre.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "shadow-guard",
+        "original": "54174347844506ae0195a0b8",
+        "disableSpaces": 4,
+        "hidesSubmitUntilRun": true,
+        "hidesPlayButton": true,
+        "hidesRunShortcut": true,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "requiredGear": {},
+        "restrictedGear": {
+          "right-hand": [
+            "53e218d853457600003e3ebe"
+          ],
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax"
+        ],
+        "position": {
+          "x": 33.762835987432396,
+          "y": 11.364727709666788
+        }
+      },
+      "54ca592de4983255055a5478": {
+        "concepts": [
+          "basic_syntax",
+          "arguments"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07",
+            "546d4d259df4a17d0d449ac5",
+            "546d4d589df4a17d0d449ac9"
+          ],
+          "right-hand": [
+            "53e218d853457600003e3ebe",
+            "544d7d918494308424f564a7",
+            "544d7deb8494308424f564ab",
+            "544d7ffd8494308424f564c3",
+            "544d80598494308424f564c7",
+            "544d80928494308424f564cb",
+            "544d87188494308424f564f1",
+            "544d874f8494308424f564f5",
+            "544d877d8494308424f564f9"
+          ],
+          "programming-book": [
+            "53e4108204c00d4607a89f78"
+          ]
+        },
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "hidesRunShortcut": true,
+        "hidesPlayButton": true,
+        "adminOnly": false,
+        "practice": true,
+        "adventurer": false,
+        "original": "54ca592de4983255055a5478",
+        "slug": "enemy-mine",
+        "type": "hero",
+        "requiresSubscription": true,
+        "i18n": {},
+        "description": "Tread carefully, danger is afoot!",
+        "name": "Enemy Mine",
+        "rewards": [
+          {
+            "achievement": "54caa165fcf7f1540532890b",
+            "level": "54caa542e1bd9a4f054648b0"
+          }
+        ],
+        "campaignIndex": 3,
+        "position": {
+          "x": 40.39966204407879,
+          "y": 11.364727709666788
+        }
+      },
+      "541875da4c16460000ab990f": {
+        "campaignIndex": 4,
+        "rewards": [
+          {
+            "achievement": "541b15561ccc8eaae19f3c07",
+            "level": "5418aec24c16460000ab9aa6"
+          },
+          {
+            "achievement": "541b15561ccc8eaae19f3c07",
+            "level": "54527a6257e83800009730c7"
+          },
+          {
+            "achievement": "541b15561ccc8eaae19f3c07",
+            "level": "5452972f57e83800009730de"
+          }
+        ],
+        "name": "True Names",
+        "description": "Learn an enemy's true name to defeat it.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "true-names",
+        "original": "541875da4c16460000ab990f",
+        "disableSpaces": 6,
+        "hidesPlayButton": true,
+        "hidesRunShortcut": true,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "requiredCode": [
+          "Brak"
+        ],
+        "requiredGear": {},
+        "restrictedGear": {
+          "programming-book": [
+            "53e4108204c00d4607a89f78"
+          ],
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "strings"
+        ],
+        "position": {
+          "x": 47.92144985442785,
+          "y": 10.462675898908136
+        }
+      },
+      "55ca293b9bc1892c835b0136": {
+        "position": {
+          "x": 53.50629543094496,
+          "y": 11.712539745627982
+        },
+        "concepts": [
+          "basic_syntax",
+          "while_loops"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07",
+            "546d4d8e9df4a17d0d449acd",
+            "546d4d589df4a17d0d449ac9",
+            "546d4d259df4a17d0d449ac5"
+          ]
+        },
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "moveRightLoopSnippet": true,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "hidesRunShortcut": true,
+        "original": "55ca293b9bc1892c835b0136",
+        "slug": "fire-dancing",
+        "type": "hero",
+        "i18n": {},
+        "description": "Save typing (and your hero) with loops!",
+        "name": "Fire Dancing",
+        "rewards": [
+          {
+            "achievement": "55ca43609bc1892c835b0144",
+            "level": "565ce2291b940587057366dd"
+          }
+        ],
+        "campaignIndex": 5,
+        "suspectCode": [
+          {
+            "name": "double-while",
+            "pattern": "while(.|\\n|\\r)*while"
+          }
+        ]
+      },
+      "565ce2291b940587057366dd": {
+        "campaignIndex": 6,
+        "rewards": [
+          {
+            "achievement": "565f86219a120c86055496b3",
+            "level": "545a5914d820eb0000f6dc0a"
+          }
+        ],
+        "name": "Loop Da Loop",
+        "description": "Loops are a life saver!",
+        "i18n": {},
+        "type": "hero",
+        "slug": "loop-da-loop",
+        "original": "565ce2291b940587057366dd",
+        "adventurer": true,
+        "hidesRunShortcut": true,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "autocompleteFontSizePx": 20,
+        "requiredGear": {},
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "while_loops"
+        ],
+        "position": {
+          "x": 60.674649532710276,
+          "y": 11.953497615262322
+        }
+      },
+      "545a5914d820eb0000f6dc0a": {
+        "campaignIndex": 7,
+        "rewards": [
+          {
+            "achievement": "545a6d67d820eb0000f6dc21",
+            "level": "5452a84d57e83800009730e4"
+          },
+          {
+            "achievement": "545a6d67d820eb0000f6dc21",
+            "level": "5418cf256bae62f707c7e1c3"
+          }
+        ],
+        "name": "Haunted Kithmaze",
+        "description": "A maze constructed to confuse travelers.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "haunted-kithmaze",
+        "original": "545a5914d820eb0000f6dc0a",
+        "hidesRunShortcut": true,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "moveRightLoopSnippet": true,
+        "autocompleteFontSizePx": 20,
+        "requiredCode": [
+          "loop"
+        ],
+        "requiredGear": {},
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "while_loops"
+        ],
+        "position": {
+          "x": 66.94834061194076,
+          "y": 11.215687947100905
+        }
+      },
+      "5418cf256bae62f707c7e1c3": {
+        "concepts": [
+          "basic_syntax",
+          "while_loops"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "moveRightLoopSnippet": true,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "original": "5418cf256bae62f707c7e1c3",
+        "slug": "the-second-kithmaze",
+        "type": "hero",
+        "i18n": {},
+        "description": "Many have tried, few have found their way through this maze.",
+        "name": "The Second Kithmaze",
+        "rewards": [
+          {
+            "achievement": "54253d5c5d84cd00002e7f63",
+            "level": "5418d40f4c16460000ab9ac2"
+          },
+          {
+            "achievement": "54253d5c5d84cd00002e7f63",
+            "item": "5441c2be4e9aeb727cc97105"
+          }
+        ],
+        "campaignIndex": 8,
+        "position": {
+          "x": 80.63272271770526,
+          "y": 12.770871081984192
+        }
+      },
+      "5418d40f4c16460000ab9ac2": {
+        "campaignIndex": 9,
+        "rewards": [
+          {
+            "achievement": "541b22b21ccc8eaae19f3c19",
+            "level": "5452adea57e83800009730ee"
+          },
+          {
+            "achievement": "541b22b21ccc8eaae19f3c19",
+            "level": "54e0cdefe308cb510555a7f5"
+          }
+        ],
+        "name": "Dread Door",
+        "description": "Behind a dread door lies a chest full of riches.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "dread-door",
+        "original": "5418d40f4c16460000ab9ac2",
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": 9,
+        "autocompleteFontSizePx": 20,
+        "requiredGear": {},
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ],
+          "right-hand": [
+            "53f4e6e3d822c23505b74f42",
+            "54694ba3a2b1f53ce794444d"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "while_loops",
+          "strings"
+        ],
+        "position": {
+          "x": 88.25112251874386,
+          "y": 19.244678910956324
+        }
+      },
+      "54e0cdefe308cb510555a7f5": {
+        "position": {
+          "y": 26.728260086243417,
+          "x": 81.15679685579524
+        },
+        "campaignIndex": 10,
+        "rewards": [
+          {
+            "achievement": "54e2ab6e0f6efa5005600737",
+            "level": "54e8e4047578d754057f852b"
+          }
+        ],
+        "name": "Cupboards of Kithgard",
+        "description": "Who knows what horrors lurk in the Cupboards of Kithgard?",
+        "i18n": {},
+        "requiresSubscription": true,
+        "type": "hero",
+        "slug": "cupboards-of-kithgard",
+        "original": "54e0cdefe308cb510555a7f5",
+        "adventurer": false,
+        "adminOnly": false,
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "requiredGear": {},
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07",
+            "546d4d8e9df4a17d0d449acd",
+            "546d4d589df4a17d0d449ac9",
+            "546d4d259df4a17d0d449ac5"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "while_loops",
+          "strings"
+        ]
+      },
+      "54f0e074a375e47f055d619c": {
+        "position": {
+          "y": 30.34167921686747,
+          "x": 73.73231720900935
+        },
+        "concepts": [
+          "basic_syntax",
+          "while_loops",
+          "strings"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07",
+            "546d4d8e9df4a17d0d449acd",
+            "546d4d589df4a17d0d449ac9",
+            "546d4d259df4a17d0d449ac5"
+          ]
+        },
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "adminOnly": false,
+        "adventurer": false,
+        "original": "54f0e074a375e47f055d619c",
+        "slug": "breakout",
+        "type": "hero",
+        "requiresSubscription": true,
+        "i18n": {},
+        "description": "Munchkins are chasing you, and the way ahead is blocked!",
+        "name": "Breakout",
+        "rewards": [],
+        "campaignIndex": 11
+      },
+      "5452adea57e83800009730ee": {
+        "campaignIndex": 12,
+        "rewards": [
+          {
+            "achievement": "5452bb6757e83800009730f4",
+            "item": "53e238df53457600003e3f0b"
+          },
+          {
+            "achievement": "5452bb6757e83800009730f4",
+            "level": "5452c3ce57e83800009730f7"
+          }
+        ],
+        "name": "Known Enemy",
+        "description": "Using your first variable to achieve victory.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "known-enemy",
+        "original": "5452adea57e83800009730ee",
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "suspectCode": [
+          {
+            "name": "enemy-in-quotes",
+            "pattern": "['\"]enemy"
+          }
+        ],
+        "requiredGear": {},
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "variables",
+          "basic_syntax",
+          "strings"
+        ],
+        "position": {
+          "x": 69.65270816049042,
+          "y": 25.67195662532944
+        }
+      },
+      "5452c3ce57e83800009730f7": {
+        "position": {
+          "y": 26.387842017483997,
+          "x": 56.47568004086775
+        },
+        "concepts": [
+          "basic_syntax",
+          "variables"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "requiredGear": {},
+        "suspectCode": [
+          {
+            "name": "lone-find-nearest-enemy",
+            "pattern": "^[ ]*(self|this|@)?[:.]?findNearestEnemy()"
+          }
+        ],
+        "requiredCode": [
+          "findNearestEnemy"
+        ],
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "original": "5452c3ce57e83800009730f7",
+        "slug": "master-of-names",
+        "type": "hero",
+        "i18n": {},
+        "description": "Use your new coding powers to target nameless enemies.",
+        "name": "Master of Names",
+        "rewards": [
+          {
+            "achievement": "5452e88a06a59e000067e50e",
+            "level": "541b24511ccc8eaae19f3c1f"
+          }
+        ],
+        "campaignIndex": 13
+      },
+      "55ca29439bc1892c835b0137": {
+        "campaignIndex": 14,
+        "rewards": [
+          {
+            "achievement": "55ca45629bc1892c835b014c",
+            "level": "541b434e1ccc8eaae19f3c33"
+          }
+        ],
+        "name": "A Mayhem of Munchkins",
+        "description": "Survive a neverending stream of ogres with mentorship from two experienced heroes!",
+        "i18n": {},
+        "type": "hero",
+        "slug": "a-mayhem-of-munchkins",
+        "original": "55ca29439bc1892c835b0137",
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "suspectCode": [
+          {
+            "name": "lone-find-nearest-enemy",
+            "pattern": "^[ ]*(self|this|@)?[:.]?findNearestEnemy()"
+          }
+        ],
+        "requiredGear": {},
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "variables",
+          "arguments",
+          "while_loops"
+        ],
+        "position": {
+          "x": 61.29479872441925,
+          "y": 34.55907063311842
+        }
+      },
+      "5452d8b906a59e000067e4fa": {
+        "position": {
+          "y": 40.53034954760448,
+          "x": 68.66942399136555
+        },
+        "concepts": [
+          "basic_syntax",
+          "variables",
+          "while_loops"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {
+          "right-hand": [
+            "53f4e6e3d822c23505b74f42"
+          ],
+          "feet": [
+            "53e2384453457600003e3f07"
+          ]
+        },
+        "requiredGear": {},
+        "suspectCode": [
+          {
+            "name": "lone-find-nearest-enemy",
+            "pattern": "^[ ]*(self|this|@)?[:.]?findNearestEnemy()"
+          }
+        ],
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "hidesHUD": true,
+        "practice": true,
+        "original": "5452d8b906a59e000067e4fa",
+        "slug": "the-gauntlet",
+        "type": "hero",
+        "requiresSubscription": true,
+        "i18n": {},
+        "description": "Use all of your skills to survive the gauntlet.",
+        "name": "The Gauntlet",
+        "rewards": [
+          {
+            "achievement": "5452db0106a59e000067e4fc",
+            "level": "54d24c49bf87255405a8f834"
+          }
+        ],
+        "campaignIndex": 15
+      },
+      "541b434e1ccc8eaae19f3c33": {
+        "campaignIndex": 16,
+        "rewards": [
+          {
+            "achievement": "54253e065d84cd00002e7f65",
+            "level": "541c9a30c6362edfb0f34479"
+          },
+          {
+            "achievement": "54253e065d84cd00002e7f65",
+            "level": "5452d8b906a59e000067e4fa"
+          },
+          {
+            "achievement": "54253e065d84cd00002e7f65",
+            "item": "53f4e6e3d822c23505b74f42"
+          }
+        ],
+        "name": "The Final Kithmaze",
+        "description": "To escape you must find your way through an elder Kithman's maze.",
+        "i18n": {},
+        "type": "hero",
+        "slug": "the-final-kithmaze",
+        "original": "541b434e1ccc8eaae19f3c33",
+        "hidesHUD": true,
+        "hidesSay": true,
+        "hidesCodeToolbar": true,
+        "hidesRealTimePlayback": true,
+        "backspaceThrottle": true,
+        "lockDefaultCode": false,
+        "autocompleteFontSizePx": 20,
+        "suspectCode": [
+          {
+            "name": "lone-find-nearest-enemy",
+            "pattern": "^[ ]*(self|this|@)?[:.]?findNearestEnemy()"
+          }
+        ],
+        "requiredGear": {},
+        "campaign": "dungeon",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "while_loops",
+          "variables"
+        ],
+        "position": {
+          "x": 74.56912900611479,
+          "y": 46.45561310182135
+        }
+      },
+      "541c9a30c6362edfb0f34479": {
+        "position": {
+          "y": 54.939545780779376,
+          "x": 80.71431897968904
+        },
+        "concepts": [
+          "basic_syntax",
+          "arguments",
+          "strings"
+        ],
+        "tasks": [],
+        "campaign": "dungeon",
+        "restrictedGear": {},
+        "requiredGear": {},
+        "autocompleteFontSizePx": 20,
+        "lockDefaultCode": false,
+        "backspaceThrottle": true,
+        "hidesRealTimePlayback": true,
+        "hidesCodeToolbar": true,
+        "hidesSay": true,
+        "original": "541c9a30c6362edfb0f34479",
+        "slug": "kithgard-gates",
+        "type": "hero",
+        "i18n": {},
+        "description": "Escape the Kithgard dungeons, and don't let the guardians get you.",
+        "name": "Kithgard Gates",
+        "rewards": [
+          {
+            "achievement": "541c9cf0c6362edfb0f3447a",
+            "level": "541b67f71ccc8eaae19f3c62"
+          },
+          {
+            "achievement": "541c9cf0c6362edfb0f3447a",
+            "level": "5578843e5cda3d8905654190"
+          }
+        ],
+        "campaignIndex": 17
+      },
+      "5630eab0c0fcbd86057cc2f8": {
+        "hidesRealTimePlayback": true,
+        "rewards": [],
+        "name": "Wakka Maul",
+        "description": "![Nov17 wakka maul](/file/db/level/5630eab0c0fcbd86057cc2f8/NOV17-Wakka Maul.png)\n\nBattle your classmates while gobbling up gems! Use your programming skills and creative thinking to gain an edge over your friends.",
+        "i18n": {},
+        "type": "course-ladder",
+        "slug": "wakka-maul",
+        "original": "5630eab0c0fcbd86057cc2f8",
+        "hidesCodeToolbar": true,
+        "backspaceThrottle": true,
+        "autocompleteFontSizePx": 20,
+        "campaign": "intro",
+        "tasks": [],
+        "concepts": [
+          "basic_syntax",
+          "algorithms",
+          "arguments",
+          "strings",
+          "while_loops"
+        ],
+        "position": {
+          "x": 17.481313926042485,
+          "y": 78.3938778580024
+        },
+        "campaignIndex": 18,
+        "requiredGear": {}
+      }
+    },
+    "patches": [],
+    "type": "course"
+  }  
+  
+  course: {
+    "_id": "560f1a9f22961295f9427742",
+    "name": "Introduction to Computer Science",
+    "slug": "introduction-to-computer-science",
+    "campaignID": "55b29efd1cd6abe8ce07db0d",
+    "concepts": [
+      "basic_syntax",
+      "arguments",
+      "strings",
+      "while_loops",
+      "variables"
+    ],
+    "description": "Learn basic syntax, while loops, and the CodeCombat environment.",
+    "duration": 1,
+    "pricePerSeat": 0,
+    "free": true,
+    "screenshot": "/images/pages/courses/101_info.png"
+  }
+  
+  
+  courseInstanceSessions: [
+    {
+      "_id": "542c78d49ba93600003ee6d3",
+      "changed": "2016-01-11T18:45:07.927Z",
+      "level": {
+        "original": "5411cb3769152f1707be029c"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 1609
+    },
+    {
+      "_id": "54380da36e7af40021bf5155",
+      "changed": "2016-01-11T23:33:09.763Z",
+      "level": {
+        "original": "54173c90844506ae0195a0b4"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 724
+    },
+    {
+      "_id": "542ef2c480d9aa104e81272f",
+      "changed": "2016-01-11T18:48:40.722Z",
+      "level": {
+        "original": "54174347844506ae0195a0b8"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 409
+    },
+    {
+      "_id": "542edae22d8c150000019128",
+      "changed": "2016-01-11T18:31:36.932Z",
+      "level": {
+        "original": "541875da4c16460000ab990f"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 1659
+    },
+    {
+      "_id": "543c3dd43eb2580000d33045",
+      "changed": "2015-11-19T17:56:04.522Z",
+      "level": {
+        "original": "5418cf256bae62f707c7e1c3"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 93
+    },
+    {
+      "_id": "542ecadc2d8c150000019125",
+      "changed": "2015-11-29T19:23:11.133Z",
+      "level": {
+        "original": "5418d40f4c16460000ab9ac2"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 117
+    },
+    {
+      "_id": "5463e15d6f4cc40000b14f3a",
+      "changed": "2015-11-29T19:28:33.799Z",
+      "level": {
+        "original": "541b434e1ccc8eaae19f3c33"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 59
+    },
+    {
+      "_id": "547e0c62e19f8e58056bf872",
+      "changed": "2015-11-29T19:29:18.715Z",
+      "level": {
+        "original": "541c9a30c6362edfb0f34479"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 42
+    },
+    {
+      "_id": "545ae2504425d30000ee7db6",
+      "changed": "2015-11-29T19:25:47.361Z",
+      "level": {
+        "original": "5452adea57e83800009730ee"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 1259
+    },
+    {
+      "_id": "565b513dd458ab9219b9527b",
+      "changed": "2015-11-29T19:26:19.521Z",
+      "level": {
+        "original": "5452c3ce57e83800009730f7"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 29
+    },
+    {
+      "_id": "565b5188d458ab9219b9528a",
+      "changed": "2015-12-27T23:34:21.144Z",
+      "level": {
+        "original": "5452d8b906a59e000067e4fa"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 26
+    },
+    {
+      "_id": "546badf73470fc1104015f50",
+      "changed": "2015-11-29T19:48:44.660Z",
+      "level": {
+        "original": "545a5914d820eb0000f6dc0a"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 57
+    },
+    {
+      "_id": "55dfd5d592e9cfb607cabc2c",
+      "changed": "2015-12-03T20:06:32.309Z",
+      "level": {
+        "original": "54ca592de4983255055a5478"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 42
+    },
+    {
+      "_id": "565b50a4d458ab9219b95260",
+      "changed": "2015-11-29T19:23:52.221Z",
+      "level": {
+        "original": "54e0cdefe308cb510555a7f5"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 34
+    },
+    {
+      "_id": "565b50cad458ab9219b9526c",
+      "changed": "2015-11-29T19:25:23.814Z",
+      "level": {
+        "original": "54f0e074a375e47f055d619c"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 88
+    },
+    {
+      "_id": "55f4570530825985054b0260",
+      "changed": "2015-11-29T19:48:39.224Z",
+      "level": {
+        "original": "55ca293b9bc1892c835b0136"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 207
+    },
+    {
+      "_id": "565b515dd458ab9219b95282",
+      "changed": "2015-12-27T23:38:34.709Z",
+      "level": {
+        "original": "55ca29439bc1892c835b0137"
+      },
+      "state": {
+        "complete": true
+      },
+      "playtime": 113
+    }
+  ]
+  
+  
+  earnedAchievements: [
+    {
+      "collection": "level.sessions",
+      "triggeredBy": "54380da36e7af40021bf5155",
+      "achievement": "541a23431ccc8eaae19f3bf6",
+      "_id": "543c21473eb2580000d3303c",
+      "user": "5162fab9c92b4c751e000274",
+      "achievementName": "Gems in the Deep Completed",
+      "earnedRewarsd": {
+        "gems": 5,
+        "levels": [
+          "54174347844506ae0195a0b8"
+        ]
+      },
+      "earnedPoints": 11,
+      "changed": "2015-04-02T21:18:27.994Z",
+      "created": "2014-10-13T19:00:23.833Z",
+      "__v": 0,
+      "earnedRewards": {
+        "gems": 18,
+        "levels": [
+          "54174347844506ae0195a0b8"
+        ]
+        "items":[
+          "53e4108204c00d4607a89f78"
+        ]
+      },
+      "notified": true
+    },
+    {
+      "collection": "level.sessions",
+      "triggeredBy": "54380da36e7af40021bf5155",
+      "achievement": "5452e14006a59e000067e501",
+      "_id": "5453164e60cfd0188a82a52d",
+      "user": "5162fab9c92b4c751e000274",
+      "earnedRewards": {
+        "gems": 9
+      },
+      "earnedPoints": 5,
+      "achievementName": "Gems in the Deep Clean Code",
+      "changed": "2015-04-02T21:18:38.200Z",
+      "notified": true
+    }
+  ]
+
+  
+  level: {
+    "_id": "568d3143b38ab75c00c2a4e5",
+    "slug": "gems-in-the-deep",
+    "name": "Gems in the Deep",
+    "creator": "568d15a28d909b2500464181",
+    "original": "54173c90844506ae0195a0b4",
+    "watchers": [
+    ],
+    "__v": 0,
+    "thangs": [],
+    "systems": [],
+    "goals": [],
+    "commitMessage": "",
+    "parent": "56898f85450ac83600d8c945",
+    "scripts": [],
+    "type": "hero",
+    "description": "Quickly collect the gems; you will need them.",
+    "victory": {
+      "body": "You will find a use for these gems soon.",
+      "i18n": []
+    },
+    "nextLevel": {
+      "original": "54174347844506ae0195a0b8",
+      "majorVersion": 0
+    },
+    "terrain": "Dungeon",
+    "patches": [],
+    "i18n": [],
+    "documentation": []
+    "i18nCoverage": [],
+    "index": true,
+    "buildTime": 14891,
+    "concepts": [
+      "basic_syntax"
+    ],
+    "campaignIndex": 1,
+    "created": "2016-01-06T15:22:43.033Z",
+    "version": {
+      "isLatestMinor": true,
+      "isLatestMajor": true,
+      "minor": 123,
+      "major": 0
+    },
+    "permissions": [
+      {
+        "access": "owner",
+        "target": "51538fdb812dd9af02000001"
+      },
+      {
+        "access": "read",
+        "target": "public"
+      }
+    ]
+  }
+  
+  
+  nextLevel: {
+    "_id": "568127b67e81751f00de45f7",
+    "slug": "shadow-guard",
+    "name": "Shadow Guard",
+    "creator": "53b54cda7e17883a0575767a",
+    "original": "54174347844506ae0195a0b8",
+    "watchers": [],
+    "__v": 0,
+    "scripts": [],
+    "thangs": [],
+    "systems": [],
+    "commitMessage": "i18n patch",
+    "parent": "566fc0cb66f91c2500c38f0a",
+    "type": "hero",
+    "description": "Evade the ogre.",
+    "victory": {},
+    "nextLevel": {
+      "original": "54ca592de4983255055a5478",
+      "majorVersion": 0
+    },
+    "terrain": "Dungeon",
+    "goals": [],
+    "patches": [],
+    "i18n": {},
+    "i18nCoverage": [],
+    "loadingTip": "We automatically save your code every few seconds.",
+    "documentation": {},
+    "requiredGear": {},
+    "restrictedGear": {},
+    "helpVideos": [],
+    "campaign": "dungeon",
+    "tasks": [],
+    "buildTime": 1923,
+    "scoreTypes": ["time"],
+    "index": true,
+    "concepts": ["basic_syntax"],
+    "campaignIndex": 2,
+    "created": "2015-12-28T12:14:46.362Z",
+    "version": {
+      "isLatestMinor": true,
+      "isLatestMajor": true,
+      "minor": 123,
+      "major": 0
+    },
+    "permissions": [
+      {
+        "access": "owner",
+        "target": "51538fdb812dd9af02000001"
+      },
+      {
+        "access": "read",
+        "target": "public"
+      }
+    ]
+  }
+  
+  
+  session: {
+    "_id": "54380da36e7af40021bf5155",
+    "changed": "2016-01-08T19:01:18.508Z",
+    "level": {
+      "original": "54173c90844506ae0195a0b4",
+      "majorVersion": 0
+    },
+    "creator": "5162fab9c92b4c751e000274",
+    "state": {
+      "topScores": [
+        {
+          "type": "time",
+          "date": "2015-10-26T17:46:17.508Z",
+          "score": -13.600000000000001
+        }
+      ],
+      "playing": true,
+      "selected": "Hero Placeholder",
+      "complete": true,
+      "scripts": {
+        "ended": {
+          "Real-Time Submission": 6,
+          "Debugging Victory": 5,
+          "First Code Run": 4,
+          "First Code Preload": 3,
+          "First Code Edit": 2,
+          "Introduction": 1,
+          "Taking Too Long": 7
+        },
+        "currentScriptOffset": 0,
+        "currentScript": null
+      },
+      "goalStates": {
+        "humans-survive": {
+          "status": "success",
+          "keyFrame": "end",
+          "killed": {
+            "Hero Placeholder": false
+          }
+        },
+        "collect-gems": {
+          "collected": {
+            "Gem 4": true,
+            "Gem 3": true,
+            "Gem 2": true,
+            "Gem 1": true,
+            "Gem": true
+          },
+          "keyFrame": 118,
+          "status": "success"
+        },
+        "clean-code": {
+          "problems": {
+            "Hero Placeholder": false
+          },
+          "optional": false,
+          "keyFrame": "end",
+          "status": "success"
+        }
+      },
+      "frame": 0,
+      "flagHistory": []
+    },
+    "codeLanguage": "python",
+    "__v": 1,
+    "heroConfig": {
+      "inventory": {
+        "programming-book": "53e4108204c00d4607a89f78",
+        "feet": "53e237bf53457600003e3f05",
+        "waist": "5437002a7beba4a82024a97d",
+        "right-hand": "53e218d853457600003e3ebe",
+        "gloves": "5469425ca2b1f53ce7944421",
+        "torso": "53e22eac53457600003e3efc",
+        "eyes": "53e238df53457600003e3f0b",
+        "head": "5441c2be4e9aeb727cc97105"
+      },
+      "thangType": "529ffbf1cf1818f2be000001"
+    },
+    "code": {
+      "hero-placeholder": {
+        "plan": "# Grab all the gems using your movement commands.\n\nself.moveRight()\nself.moveUp()\nself.moveRight()\nself.moveDown()\nself.moveLeft()\nself.moveDown()\nself.moveUp()\n\n"
+      }
+    },
+    "playtime": 698,
+    "teamSpells": {
+      "humans": [
+        "hero-placeholder/plan"
+      ]
+    },
+    "creatorName": "Scott",
+    "levelID": "gems-in-the-deep",
+    "levelName": "Gems in the Deep",
+    "multiplayer": false,
+    "browser": {
+      "version": "47.0.2526.106",
+      "platform": "mac",
+      "name": "chrome",
+      "desktop": true
+    },
+    "permissions": [
+      {
+        "target": "5162fab9c92b4c751e000274",
+        "access": "owner"
+      }
+    ],
+    "created": "2014-10-10T16:47:31.077Z"
+  }
+  
+
+  thangType: {
+    "_id": "568fe842cc51432f0036beb6",
+    "slug": "programmaticon-i",
+    "name": "Programmaticon I",
+    "original": "53e4108204c00d4607a89f78",
+    "components": [
+      {
+        "original": "524b4150ff92f1f4f8000024",
+        "majorVersion": 0
+      },
+      {
+        "original": "53e12043b82921000051cdf9",
+        "majorVersion": 0,
+        "config": {
+          "slots": [
+            "programming-book"
+          ]
+        }
+      },
+      {
+        "original": "524c81cab8bb087aaf000069",
+        "majorVersion": 0,
+        "config": {
+          "programmableSnippets": [
+            "loop"
+          ]
+        }
+      }
+    ],
+    "description": "Grants access to loops.",
+    "version": {
+      "isLatestMinor": true,
+      "isLatestMajor": true,
+      "minor": 56,
+      "major": 0
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/app/views/play/level/modal/CourseVictoryModal.spec.coffee b/test/app/views/play/level/modal/CourseVictoryModal.spec.coffee
new file mode 100644
index 000000000..fda2de1eb
--- /dev/null
+++ b/test/app/views/play/level/modal/CourseVictoryModal.spec.coffee
@@ -0,0 +1,124 @@
+
+Course = require 'models/Course'
+Level = require 'models/Level'
+LevelSession = require 'models/LevelSession'
+Achievements = require 'collections/Achievements'
+CourseVictoryModal = require 'views/play/level/modal/CourseVictoryModal'
+fixtures = require './CourseVictoryModal.fixtures'
+NewItemView = require 'views/play/level/modal/NewItemView'
+ProgressView = require 'views/play/level/modal/ProgressView'
+
+describe 'CourseVictoryModal', ->
+
+  it 'will eventually be the only victory modal'
+  
+  makeViewOptions = ->
+    {
+      course: new Course(fixtures.course)
+      level: new Level(fixtures.level)
+      session: new LevelSession(fixtures.session)
+      achievements: new Achievements(fixtures.achievements)
+      nextLevel: new Level(fixtures.nextLevel)
+      courseInstanceID: '56414c3868785b5f152424f1'
+      courseID: '560f1a9f22961295f9427742'
+    }
+    
+  handleRequests = ->
+    requests = jasmine.Ajax.requests.all()
+    thangRequest = _.find(requests, (r) -> _.string.startsWith(r.url, '/db/thang.type'))
+    thangRequest?.respondWith({status: 200, responseText: JSON.stringify(fixtures.thangType)})
+
+    earnedAchievementRequests = _.where(requests, {url: '/db/earned_achievement'})
+    for [request, response] in _.zip(earnedAchievementRequests, fixtures.earnedAchievements)
+      request.respondWith({status: 200, responseText: JSON.stringify(response)})
+
+    sessionsRequest = _.find(requests, (r) -> _.string.startsWith(r.url, '/db/course_instance'))
+    sessionsRequest.respondWith({status: 200, responseText: JSON.stringify(fixtures.courseInstanceSessions)})
+
+    campaignRequest = _.findWhere(requests, {url: '/db/campaign/55b29efd1cd6abe8ce07db0d'})
+    campaignRequest.respondWith({status: 200, responseText: JSON.stringify(fixtures.campaign)})
+    
+  describe 'given a course level with a next level and no item or hero rewards', ->
+    modal = null
+
+    beforeEach (done) ->
+      options = makeViewOptions()
+      modal = new CourseVictoryModal(options)
+      handleRequests()
+      _.defer done
+
+    it 'only shows the ProgressView', ->
+      expect(_.size(modal.views)).toBe(1)
+      expect(modal.views[0] instanceof ProgressView).toBe(true)
+
+    xit '(demo)', -> currentView.openModalView(modal)
+    
+    describe 'its ProgressView', ->
+      it 'has a next level button which navigates to the next level on click', ->
+        spyOn(application.router, 'navigate')
+        button = modal.$el.find('#next-level-btn')
+        expect(button.length).toBe(1)
+        button.click()
+        expect(application.router.navigate).toHaveBeenCalled()
+        
+      it 'has two columns', ->
+        expect(modal.$('.row:first .col-sm-12').length).toBe(0)
+        expect(modal.$('.row:first .col-sm-5').length).toBe(1)
+        expect(modal.$('.row:first .col-sm-7').length).toBe(1)
+        
+  describe 'given a course level without a next level', ->
+    modal = null
+
+    beforeEach (done) ->
+      options = makeViewOptions()
+
+      # make the level not have a next level
+      level = options.level
+      level.unset('nextLevel')
+      delete options.nextLevel
+      modal = new CourseVictoryModal(options)
+      handleRequests()
+      _.defer done
+      
+    describe 'its ProgressView', ->
+      it 'has a single large column, since there is no next level to display', ->
+        expect(modal.$('.row:first .col-sm-12').length).toBe(1)
+        expect(modal.$('.row:first .col-sm-5').length).toBe(0)
+        expect(modal.$('.row:first .col-sm-7').length).toBe(0)
+        
+      it 'has a done button which navigates to the CourseDetailsView for the given course instance', ->
+        spyOn(application.router, 'navigate')
+        button = modal.$el.find('#done-btn')
+        expect(button.length).toBe(1)
+        button.click()
+        expect(application.router.navigate).toHaveBeenCalled()
+
+    xit '(demo)', -> currentView.openModalView(modal)
+      
+
+  describe 'given a course level with a new item', ->
+    modal = null
+    
+    beforeEach (done) ->
+      options = makeViewOptions()
+      
+      # insert new item into achievement properties
+      achievement = options.achievements.first()
+      rewards = _.cloneDeep(achievement.get('rewards'))
+      rewards.items = ["53e4108204c00d4607a89f78"]
+      achievement.set('rewards', rewards)
+      
+      modal = new CourseVictoryModal(options)
+      handleRequests()
+      _.defer done
+      
+    it 'includes a NewItemView when the level rewards a new item', ->
+      expect(_.size(modal.views)).toBe(2)
+      expect(modal.views[0] instanceof NewItemView).toBe(true)
+      
+    it 'continues to the ProgressView when you click the continue button', ->
+      expect(modal.currentView instanceof NewItemView).toBe(true)
+      modal.$el.find('#continue-btn').click()
+      expect(modal.currentView instanceof ProgressView).toBe(true)
+    
+    xit '(demo)', -> currentView.openModalView(modal)
diff --git a/vendor/scripts/jasmine-boot.js b/vendor/scripts/jasmine-boot.js
index 47b125211..17ec5589a 100755
--- a/vendor/scripts/jasmine-boot.js
+++ b/vendor/scripts/jasmine-boot.js
@@ -1,5 +1,29 @@
+// Changes made to this file from the default are marked with CHANGE comment
+
+/*
+ Copyright (c) 2008-2015 Pivotal Labs
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 /**
- Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
+ Starting with version 2.0, this file "boots" Jasmine, performing all of the necessary initialization before executing the loaded environment and all of a project's specs. This file should be loaded after `jasmine.js` and `jasmine_html.js`, but before any project source files or spec files are loaded. Thus this file can also be used to customize Jasmine for a project.
 
  If a project is using Jasmine via the standalone distribution, this file can be customized directly. If a project is using Jasmine via the [Ruby gem][jasmine-gem], this file can be copied into the support directory via `jasmine copy_boot_js`. Other environments (e.g., Python) will have different mechanisms.
 
@@ -32,77 +56,12 @@
    *
    * Build up the functions that will be exposed as the Jasmine public interface. A project can customize, rename or alias any of these functions as desired, provided the implementation remains unchanged.
    */
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    jsApiReporter: new jasmine.JsApiReporter({
-      timer: new jasmine.Timer()
-    })
-  };
+  var jasmineInterface = jasmineRequire.interface(jasmine, env);
 
   /**
-   * Add all of the Jasmine global/public interface to the proper global, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
+   * Add all of the Jasmine global/public interface to the global scope, so a project can use the public interface directly. For example, calling `describe` in specs instead of `jasmine.getEnv().describe`.
    */
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
-
-  /**
-   * Expose the interface for adding custom equality testers.
-   */
-  jasmine.addCustomEqualityTester = function(tester) {
-    env.addCustomEqualityTester(tester);
-  };
-
-  /**
-   * Expose the interface for adding custom expectation matchers
-   */
-  jasmine.addMatchers = function(matchers) {
-    return env.addMatchers(matchers);
-  };
-
-  /**
-   * Expose the mock interface for the JavaScript timeout functions
-   */
-  jasmine.clock = function() {
-    return env.clock;
-  };
+  extend(window, jasmineInterface);
 
   /**
    * ## Runner Parameters
@@ -114,16 +73,32 @@
     getWindowLocation: function() { return window.location; }
   });
 
-  var catchingExceptions = false; // Setting to false always for CodeCombat, because Jasmine-HTML's reporter doesn't do source maps, and Chrome console does.
+  // CHANGE: Setting to false always, because Jasmine-HTML's reporter doesn't do source maps, and Chrome console does.
+  var catchingExceptions = false;
   env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
 
+  var throwingExpectationFailures = queryString.getParam("throwFailures");
+  env.throwOnExpectationFailure(throwingExpectationFailures);
+
+  var random = queryString.getParam("random");
+  env.randomizeTests(random);
+
+  var seed = queryString.getParam("seed");
+  if (seed) {
+    env.seed(seed);
+  }
+
   /**
    * ## Reporters
    * The `HtmlReporter` builds all of the HTML UI for the runner page. This reporter paints the dots, stars, and x's for specs, as well as all spec names and all failures (if any).
    */
   var htmlReporter = new jasmine.HtmlReporter({
     env: env,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
+    onRaiseExceptionsClick: function() { queryString.navigateWithNewParam("catch", !env.catchingExceptions()); },
+    onThrowExpectationsClick: function() { queryString.navigateWithNewParam("throwFailures", !env.throwingExpectationFailures()); },
+    onRandomClick: function() { queryString.navigateWithNewParam("random", !env.randomTests()); },
+    addToExistingQueryString: function(key, value) { return queryString.fullStringWithNewParam(key, value); },
+    // CHANGE: put #testing-area, not body
     getContainer: function() { return $('#testing-area')[0]; },
     createElement: function() { return document.createElement.apply(document, arguments); },
     createTextNode: function() { return document.createTextNode.apply(document, arguments); },
@@ -160,6 +135,7 @@
    *
    * Replace the browser window's `onload`, ensure it's called, and then run all of the loaded specs. This includes initializing the `HtmlReporter` instance and then executing the loaded Jasmine environment. All of this will happen after all of the specs are loaded.
    */
+  // CHANGE: give start control to testing page
   window.runJasmine = function() {
     htmlReporter.initialize();
     env.execute();
@@ -173,4 +149,4 @@
     return destination;
   }
 
-}());
+}());
\ No newline at end of file
diff --git a/vendor/scripts/jasmine.js b/vendor/scripts/jasmine.js
index 24463ecb8..ad63dff7c 100755
--- a/vendor/scripts/jasmine.js
+++ b/vendor/scripts/jasmine.js
@@ -1,83 +1,107 @@
 /*
-Copyright (c) 2008-2013 Pivotal Labs
+ Copyright (c) 2008-2015 Pivotal Labs
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-function getJasmineRequireObj() {
-  if (typeof module !== "undefined" && module.exports) {
-    return exports;
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+var getJasmineRequireObj = (function (jasmineGlobal) {
+  var jasmineRequire;
+
+  if (typeof module !== 'undefined' && module.exports) {
+    if (typeof global !== 'undefined') {
+      jasmineGlobal = global;
+    } else {
+      jasmineGlobal = {};
+    }
+    jasmineRequire = exports;
   } else {
-    window.jasmineRequire = window.jasmineRequire || {};
-    return window.jasmineRequire;
+    if (typeof window !== 'undefined' && typeof window.toString === 'function' && window.toString() === '[object GjsGlobal]') {
+      jasmineGlobal = window;
+    }
+    jasmineRequire = jasmineGlobal.jasmineRequire = jasmineGlobal.jasmineRequire || {};
   }
-}
 
-getJasmineRequireObj().core = function(jRequire) {
-  var j$ = {};
+  function getJasmineRequire() {
+    return jasmineRequire;
+  }
 
-  jRequire.base(j$);
-  j$.util = jRequire.util();
-  j$.Any = jRequire.Any();
-  j$.CallTracker = jRequire.CallTracker();
-  j$.Clock = jRequire.Clock();
-  j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler();
-  j$.Env = jRequire.Env(j$);
-  j$.ExceptionFormatter = jRequire.ExceptionFormatter();
-  j$.Expectation = jRequire.Expectation();
-  j$.buildExpectationResult = jRequire.buildExpectationResult();
-  j$.JsApiReporter = jRequire.JsApiReporter();
-  j$.matchersUtil = jRequire.matchersUtil(j$);
-  j$.ObjectContaining = jRequire.ObjectContaining(j$);
-  j$.pp = jRequire.pp(j$);
-  j$.QueueRunner = jRequire.QueueRunner();
-  j$.ReportDispatcher = jRequire.ReportDispatcher();
-  j$.Spec = jRequire.Spec(j$);
-  j$.SpyStrategy = jRequire.SpyStrategy();
-  j$.Suite = jRequire.Suite();
-  j$.Timer = jRequire.Timer();
-  j$.version = jRequire.version();
+  getJasmineRequire().core = function(jRequire) {
+    var j$ = {};
 
-  j$.matchers = jRequire.requireMatchers(jRequire, j$);
+    jRequire.base(j$, jasmineGlobal);
+    j$.util = jRequire.util();
+    j$.errors = jRequire.errors();
+    j$.Any = jRequire.Any(j$);
+    j$.Anything = jRequire.Anything(j$);
+    j$.CallTracker = jRequire.CallTracker();
+    j$.MockDate = jRequire.MockDate();
+    j$.Clock = jRequire.Clock();
+    j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler();
+    j$.Env = jRequire.Env(j$);
+    j$.ExceptionFormatter = jRequire.ExceptionFormatter();
+    j$.Expectation = jRequire.Expectation();
+    j$.buildExpectationResult = jRequire.buildExpectationResult();
+    j$.JsApiReporter = jRequire.JsApiReporter();
+    j$.matchersUtil = jRequire.matchersUtil(j$);
+    j$.ObjectContaining = jRequire.ObjectContaining(j$);
+    j$.ArrayContaining = jRequire.ArrayContaining(j$);
+    j$.pp = jRequire.pp(j$);
+    j$.QueueRunner = jRequire.QueueRunner(j$);
+    j$.ReportDispatcher = jRequire.ReportDispatcher();
+    j$.Spec = jRequire.Spec(j$);
+    j$.SpyRegistry = jRequire.SpyRegistry(j$);
+    j$.SpyStrategy = jRequire.SpyStrategy();
+    j$.StringMatching = jRequire.StringMatching(j$);
+    j$.Suite = jRequire.Suite(j$);
+    j$.Timer = jRequire.Timer();
+    j$.TreeProcessor = jRequire.TreeProcessor();
+    j$.version = jRequire.version();
+    j$.Order = jRequire.Order();
 
-  return j$;
-};
+    j$.matchers = jRequire.requireMatchers(jRequire, j$);
+
+    return j$;
+  };
+
+  return getJasmineRequire;
+})(this);
 
 getJasmineRequireObj().requireMatchers = function(jRequire, j$) {
   var availableMatchers = [
-      "toBe",
-      "toBeCloseTo",
-      "toBeDefined",
-      "toBeFalsy",
-      "toBeGreaterThan",
-      "toBeLessThan",
-      "toBeNaN",
-      "toBeNull",
-      "toBeTruthy",
-      "toBeUndefined",
-      "toContain",
-      "toEqual",
-      "toHaveBeenCalled",
-      "toHaveBeenCalledWith",
-      "toMatch",
-      "toThrow",
-      "toThrowError"
+      'toBe',
+      'toBeCloseTo',
+      'toBeDefined',
+      'toBeFalsy',
+      'toBeGreaterThan',
+      'toBeLessThan',
+      'toBeNaN',
+      'toBeNull',
+      'toBeTruthy',
+      'toBeUndefined',
+      'toContain',
+      'toEqual',
+      'toHaveBeenCalled',
+      'toHaveBeenCalledWith',
+      'toHaveBeenCalledTimes',
+      'toMatch',
+      'toThrow',
+      'toThrowError'
     ],
     matchers = {};
 
@@ -89,20 +113,18 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) {
   return matchers;
 };
 
-getJasmineRequireObj().base = function(j$) {
+getJasmineRequireObj().base = function(j$, jasmineGlobal) {
   j$.unimplementedMethod_ = function() {
-    throw new Error("unimplemented method");
+    throw new Error('unimplemented method');
   };
 
   j$.MAX_PRETTY_PRINT_DEPTH = 40;
+  j$.MAX_PRETTY_PRINT_ARRAY_LENGTH = 100;
   j$.DEFAULT_TIMEOUT_INTERVAL = 5000;
 
-  j$.getGlobal = (function() {
-    var jasmineGlobal = eval.call(null, "this");
-    return function() {
-      return jasmineGlobal;
-    };
-  })();
+  j$.getGlobal = function() {
+    return jasmineGlobal;
+  };
 
   j$.getEnv = function(options) {
     var env = j$.currentEnv_ = j$.currentEnv_ || new j$.Env(options);
@@ -111,15 +133,15 @@ getJasmineRequireObj().base = function(j$) {
   };
 
   j$.isArray_ = function(value) {
-    return j$.isA_("Array", value);
+    return j$.isA_('Array', value);
   };
 
   j$.isString_ = function(value) {
-    return j$.isA_("String", value);
+    return j$.isA_('String', value);
   };
 
   j$.isNumber_ = function(value) {
-    return j$.isA_("Number", value);
+    return j$.isA_('Number', value);
   };
 
   j$.isA_ = function(typeName, value) {
@@ -130,14 +152,30 @@ getJasmineRequireObj().base = function(j$) {
     return obj.nodeType > 0;
   };
 
+  j$.fnNameFor = function(func) {
+    return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
+  };
+
   j$.any = function(clazz) {
     return new j$.Any(clazz);
   };
 
+  j$.anything = function() {
+    return new j$.Anything();
+  };
+
   j$.objectContaining = function(sample) {
     return new j$.ObjectContaining(sample);
   };
 
+  j$.stringMatching = function(expected) {
+    return new j$.StringMatching(expected);
+  };
+
+  j$.arrayContaining = function(sample) {
+    return new j$.ArrayContaining(sample);
+  };
+
   j$.createSpy = function(name, originalFn) {
 
     var spyStrategy = new j$.SpyStrategy({
@@ -147,16 +185,21 @@ getJasmineRequireObj().base = function(j$) {
       }),
       callTracker = new j$.CallTracker(),
       spy = function() {
-        callTracker.track({
+        var callData = {
           object: this,
           args: Array.prototype.slice.apply(arguments)
-        });
-        return spyStrategy.exec.apply(this, arguments);
+        };
+
+        callTracker.track(callData);
+        var returnValue = spyStrategy.exec.apply(this, arguments);
+        callData.returnValue = returnValue;
+
+        return returnValue;
       };
 
     for (var prop in originalFn) {
       if (prop === 'and' || prop === 'calls') {
-        throw new Error("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon");
+        throw new Error('Jasmine spies would overwrite the \'and\' and \'calls\' properties on the object being spied upon');
       }
 
       spy[prop] = originalFn[prop];
@@ -177,8 +220,13 @@ getJasmineRequireObj().base = function(j$) {
   };
 
   j$.createSpyObj = function(baseName, methodNames) {
+    if (j$.isArray_(baseName) && j$.util.isUndefined(methodNames)) {
+      methodNames = baseName;
+      baseName = 'unknown';
+    }
+
     if (!j$.isArray_(methodNames) || methodNames.length === 0) {
-      throw "createSpyObj requires a non-empty array of method names to create spies for";
+      throw 'createSpyObj requires a non-empty array of method names to create spies for';
     }
     var obj = {};
     for (var i = 0; i < methodNames.length; i++) {
@@ -220,6 +268,31 @@ getJasmineRequireObj().util = function() {
     return obj === void 0;
   };
 
+  util.arrayContains = function(array, search) {
+    var i = array.length;
+    while (i--) {
+      if (array[i] === search) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  util.clone = function(obj) {
+    if (Object.prototype.toString.apply(obj) === '[object Array]') {
+      return obj.slice();
+    }
+
+    var cloned = {};
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        cloned[prop] = obj[prop];
+      }
+    }
+
+    return cloned;
+  };
+
   return util;
 };
 
@@ -229,19 +302,17 @@ getJasmineRequireObj().Spec = function(j$) {
     this.resultCallback = attrs.resultCallback || function() {};
     this.id = attrs.id;
     this.description = attrs.description || '';
-    this.fn = attrs.fn;
-    this.beforeFns = attrs.beforeFns || function() { return []; };
-    this.afterFns = attrs.afterFns || function() { return []; };
+    this.queueableFn = attrs.queueableFn;
+    this.beforeAndAfterFns = attrs.beforeAndAfterFns || function() { return {befores: [], afters: []}; };
+    this.userContext = attrs.userContext || function() { return {}; };
     this.onStart = attrs.onStart || function() {};
-    this.exceptionFormatter = attrs.exceptionFormatter || function() {};
     this.getSpecName = attrs.getSpecName || function() { return ''; };
     this.expectationResultFactory = attrs.expectationResultFactory || function() { };
     this.queueRunnerFactory = attrs.queueRunnerFactory || function() {};
     this.catchingExceptions = attrs.catchingExceptions || function() { return true; };
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;
 
-    this.timer = attrs.timer || {setTimeout: setTimeout, clearTimeout: clearTimeout};
-
-    if (!this.fn) {
+    if (!this.queueableFn.fn) {
       this.pend();
     }
 
@@ -249,84 +320,51 @@ getJasmineRequireObj().Spec = function(j$) {
       id: this.id,
       description: this.description,
       fullName: this.getFullName(),
-      failedExpectations: []
+      failedExpectations: [],
+      passedExpectations: [],
+      pendingReason: ''
     };
   }
 
-  Spec.prototype.addExpectationResult = function(passed, data) {
+  Spec.prototype.addExpectationResult = function(passed, data, isError) {
+    var expectationResult = this.expectationResultFactory(data);
     if (passed) {
-      return;
+      this.result.passedExpectations.push(expectationResult);
+    } else {
+      this.result.failedExpectations.push(expectationResult);
+
+      if (this.throwOnExpectationFailure && !isError) {
+        throw new j$.errors.ExpectationFailed();
+      }
     }
-    this.result.failedExpectations.push(this.expectationResultFactory(data));
   };
 
   Spec.prototype.expect = function(actual) {
     return this.expectationFactory(actual, this);
   };
 
-  Spec.prototype.execute = function(onComplete) {
-    var self = this,
-        timeout;
+  Spec.prototype.execute = function(onComplete, enabled) {
+    var self = this;
 
     this.onStart(this);
 
-    if (this.markedPending || this.disabled) {
-      complete();
+    if (!this.isExecutable() || this.markedPending || enabled === false) {
+      complete(enabled);
       return;
     }
 
-    function timeoutable(fn) {
-      return function(done) {
-        timeout = Function.prototype.apply.apply(self.timer.setTimeout, [j$.getGlobal(), [function() {
-          onException(new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.'));
-          done();
-        }, j$.DEFAULT_TIMEOUT_INTERVAL]]);
-
-        var callDone = function() {
-          clearTimeoutable();
-          done();
-        };
-
-        fn.call(this, callDone); //TODO: do we care about more than 1 arg?
-      };
-    }
-
-    function clearTimeoutable() {
-      Function.prototype.apply.apply(self.timer.clearTimeout, [j$.getGlobal(), [timeout]]);
-      timeout = void 0;
-    }
-
-    var allFns = this.beforeFns().concat(this.fn).concat(this.afterFns()),
-      allTimeoutableFns = [];
-    for (var i = 0; i < allFns.length; i++) {
-      var fn = allFns[i];
-      allTimeoutableFns.push(fn.length > 0 ? timeoutable(fn) : fn);
-    }
+    var fns = this.beforeAndAfterFns();
+    var allFns = fns.befores.concat(this.queueableFn).concat(fns.afters);
 
     this.queueRunnerFactory({
-      fns: allTimeoutableFns,
-      onException: onException,
-      onComplete: complete
+      queueableFns: allFns,
+      onException: function() { self.onException.apply(self, arguments); },
+      onComplete: complete,
+      userContext: this.userContext()
     });
 
-    function onException(e) {
-      clearTimeoutable();
-      if (Spec.isPendingSpecException(e)) {
-        self.pend();
-        return;
-      }
-
-      self.addExpectationResult(false, {
-        matcherName: "",
-        passed: false,
-        expected: "",
-        actual: "",
-        error: e
-      });
-    }
-
-    function complete() {
-      self.result.status = self.status();
+    function complete(enabledAgain) {
+      self.result.status = self.status(enabledAgain);
       self.resultCallback(self.result);
 
       if (onComplete) {
@@ -335,16 +373,43 @@ getJasmineRequireObj().Spec = function(j$) {
     }
   };
 
+  Spec.prototype.onException = function onException(e) {
+    if (Spec.isPendingSpecException(e)) {
+      this.pend(extractCustomPendingMessage(e));
+      return;
+    }
+
+    if (e instanceof j$.errors.ExpectationFailed) {
+      return;
+    }
+
+    this.addExpectationResult(false, {
+      matcherName: '',
+      passed: false,
+      expected: '',
+      actual: '',
+      error: e
+    }, true);
+  };
+
   Spec.prototype.disable = function() {
     this.disabled = true;
   };
 
-  Spec.prototype.pend = function() {
+  Spec.prototype.pend = function(message) {
     this.markedPending = true;
+    if (message) {
+      this.result.pendingReason = message;
+    }
   };
 
-  Spec.prototype.status = function() {
-    if (this.disabled) {
+  Spec.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
+  };
+
+  Spec.prototype.status = function(enabled) {
+    if (this.disabled || enabled === false) {
       return 'disabled';
     }
 
@@ -359,23 +424,82 @@ getJasmineRequireObj().Spec = function(j$) {
     }
   };
 
+  Spec.prototype.isExecutable = function() {
+    return !this.disabled;
+  };
+
   Spec.prototype.getFullName = function() {
     return this.getSpecName(this);
   };
 
-  Spec.pendingSpecExceptionMessage = "=> marked Pending";
+  var extractCustomPendingMessage = function(e) {
+    var fullMessage = e.toString(),
+      boilerplateStart = fullMessage.indexOf(Spec.pendingSpecExceptionMessage),
+      boilerplateEnd = boilerplateStart + Spec.pendingSpecExceptionMessage.length;
+
+    return fullMessage.substr(boilerplateEnd);
+  };
+
+  Spec.pendingSpecExceptionMessage = '=> marked Pending';
 
   Spec.isPendingSpecException = function(e) {
-    return e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1;
+    return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1);
   };
 
   return Spec;
 };
 
-if (typeof window == void 0 && typeof exports == "object") {
+if (typeof window == void 0 && typeof exports == 'object') {
   exports.Spec = jasmineRequire.Spec;
 }
 
+/*jshint bitwise: false*/
+
+getJasmineRequireObj().Order = function() {
+  function Order(options) {
+    this.random = 'random' in options ? options.random : true;
+    var seed = this.seed = options.seed || generateSeed();
+    this.sort = this.random ? randomOrder : naturalOrder;
+
+    function naturalOrder(items) {
+      return items;
+    }
+
+    function randomOrder(items) {
+      var copy = items.slice();
+      copy.sort(function(a, b) {
+        return jenkinsHash(seed + a.id) - jenkinsHash(seed + b.id);
+      });
+      return copy;
+    }
+
+    function generateSeed() {
+      return String(Math.random()).slice(-5);
+    }
+
+    // Bob Jenkins One-at-a-Time Hash algorithm is a non-cryptographic hash function
+    // used to get a different output when the key changes slighly.
+    // We use your return to sort the children randomly in a consistent way when
+    // used in conjunction with a seed
+
+    function jenkinsHash(key) {
+      var hash, i;
+      for(hash = i = 0; i < key.length; ++i) {
+        hash += key.charCodeAt(i);
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
+      }
+      hash += (hash << 3);
+      hash ^= (hash >> 11);
+      hash += (hash << 15);
+      return hash;
+    }
+
+  }
+
+  return Order;
+};
+
 getJasmineRequireObj().Env = function(j$) {
   function Env(options) {
     options = options || {};
@@ -389,33 +513,54 @@ getJasmineRequireObj().Env = function(j$) {
 
     var realSetTimeout = j$.getGlobal().setTimeout;
     var realClearTimeout = j$.getGlobal().clearTimeout;
-    this.clock = new j$.Clock(global, new j$.DelayedFunctionScheduler());
+    this.clock = new j$.Clock(global, function () { return new j$.DelayedFunctionScheduler(); }, new j$.MockDate(global));
 
     var runnableLookupTable = {};
-
-    var spies = [];
+    var runnableResources = {};
 
     var currentSpec = null;
-    var currentSuite = null;
+    var currentlyExecutingSuites = [];
+    var currentDeclarationSuite = null;
+    var throwOnExpectationFailure = false;
+    var random = false;
+    var seed = null;
+
+    var currentSuite = function() {
+      return currentlyExecutingSuites[currentlyExecutingSuites.length - 1];
+    };
+
+    var currentRunnable = function() {
+      return currentSpec || currentSuite();
+    };
 
     var reporter = new j$.ReportDispatcher([
-      "jasmineStarted",
-      "jasmineDone",
-      "suiteStarted",
-      "suiteDone",
-      "specStarted",
-      "specDone"
+      'jasmineStarted',
+      'jasmineDone',
+      'suiteStarted',
+      'suiteDone',
+      'specStarted',
+      'specDone'
     ]);
 
     this.specFilter = function() {
       return true;
     };
 
-    var equalityTesters = [];
-
-    var customEqualityTesters = [];
     this.addCustomEqualityTester = function(tester) {
-      customEqualityTesters.push(tester);
+      if(!currentRunnable()) {
+        throw new Error('Custom Equalities must be added in a before function or a spec');
+      }
+      runnableResources[currentRunnable().id].customEqualityTesters.push(tester);
+    };
+
+    this.addMatchers = function(matchersToAdd) {
+      if(!currentRunnable()) {
+        throw new Error('Matchers must be added in a before function or a spec');
+      }
+      var customMatchers = runnableResources[currentRunnable().id].customMatchers;
+      for (var matcherName in matchersToAdd) {
+        customMatchers[matcherName] = matchersToAdd[matcherName];
+      }
     };
 
     j$.Expectation.addCoreMatchers(j$.matchers);
@@ -433,7 +578,8 @@ getJasmineRequireObj().Env = function(j$) {
     var expectationFactory = function(actual, spec) {
       return j$.Expectation.Factory({
         util: j$.matchersUtil,
-        customEqualityTesters: customEqualityTesters,
+        customEqualityTesters: runnableResources[spec.id].customEqualityTesters,
+        customMatchers: runnableResources[spec.id].customMatchers,
         actual: actual,
         addExpectationResult: addExpectationResult
       });
@@ -443,30 +589,38 @@ getJasmineRequireObj().Env = function(j$) {
       }
     };
 
-    var specStarted = function(spec) {
-      currentSpec = spec;
-      reporter.specStarted(spec.result);
+    var defaultResourcesForRunnable = function(id, parentRunnableId) {
+      var resources = {spies: [], customEqualityTesters: [], customMatchers: {}};
+
+      if(runnableResources[parentRunnableId]){
+        resources.customEqualityTesters = j$.util.clone(runnableResources[parentRunnableId].customEqualityTesters);
+        resources.customMatchers = j$.util.clone(runnableResources[parentRunnableId].customMatchers);
+      }
+
+      runnableResources[id] = resources;
     };
 
-    var beforeFns = function(suite) {
+    var clearResourcesForRunnable = function(id) {
+      spyRegistry.clearSpies();
+      delete runnableResources[id];
+    };
+
+    var beforeAndAfterFns = function(suite) {
       return function() {
-        var befores = [];
+        var befores = [],
+          afters = [];
+
         while(suite) {
           befores = befores.concat(suite.beforeFns);
-          suite = suite.parentSuite;
-        }
-        return befores.reverse();
-      };
-    };
-
-    var afterFns = function(suite) {
-      return function() {
-        var afters = [];
-        while(suite) {
           afters = afters.concat(suite.afterFns);
+
           suite = suite.parentSuite;
         }
-        return afters;
+
+        return {
+          befores: befores.reverse(),
+          afters: afters
+        };
       };
     };
 
@@ -476,13 +630,13 @@ getJasmineRequireObj().Env = function(j$) {
 
     // TODO: we may just be able to pass in the fn instead of wrapping here
     var buildExpectationResult = j$.buildExpectationResult,
-        exceptionFormatter = new j$.ExceptionFormatter(),
-        expectationResultFactory = function(attrs) {
-          attrs.messageFormatter = exceptionFormatter.message;
-          attrs.stackFormatter = exceptionFormatter.stack;
+      exceptionFormatter = new j$.ExceptionFormatter(),
+      expectationResultFactory = function(attrs) {
+        attrs.messageFormatter = exceptionFormatter.message;
+        attrs.stackFormatter = exceptionFormatter.stack;
 
-          return buildExpectationResult(attrs);
-        };
+        return buildExpectationResult(attrs);
+      };
 
     // TODO: fix this naming, and here's where the value comes in
     this.catchExceptions = function(value) {
@@ -511,9 +665,34 @@ getJasmineRequireObj().Env = function(j$) {
       return j$.Spec.isPendingSpecException(e) || catchExceptions;
     };
 
+    this.throwOnExpectationFailure = function(value) {
+      throwOnExpectationFailure = !!value;
+    };
+
+    this.throwingExpectationFailures = function() {
+      return throwOnExpectationFailure;
+    };
+
+    this.randomizeTests = function(value) {
+      random = !!value;
+    };
+
+    this.randomTests = function() {
+      return random;
+    };
+
+    this.seed = function(value) {
+      if (value) {
+        seed = value;
+      }
+      return seed;
+    };
+
     var queueRunnerFactory = function(options) {
       options.catchException = catchException;
       options.clearStack = options.clearStack || clearStack;
+      options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
+      options.fail = self.fail;
 
       new j$.QueueRunner(options).execute();
     };
@@ -522,66 +701,79 @@ getJasmineRequireObj().Env = function(j$) {
       env: this,
       id: getNextSuiteId(),
       description: 'Jasmine__TopLevel__Suite',
-      queueRunner: queueRunnerFactory,
-      resultCallback: function() {} // TODO - hook this up
+      queueRunner: queueRunnerFactory
     });
     runnableLookupTable[topSuite.id] = topSuite;
-    currentSuite = topSuite;
+    defaultResourcesForRunnable(topSuite.id);
+    currentDeclarationSuite = topSuite;
 
     this.topSuite = function() {
       return topSuite;
     };
 
     this.execute = function(runnablesToRun) {
-      runnablesToRun = runnablesToRun || [topSuite.id];
+      if(!runnablesToRun) {
+        if (focusedRunnables.length) {
+          runnablesToRun = focusedRunnables;
+        } else {
+          runnablesToRun = [topSuite.id];
+        }
+      }
 
-      var allFns = [];
-      for(var i = 0; i < runnablesToRun.length; i++) {
-        var runnable = runnableLookupTable[runnablesToRun[i]];
-        allFns.push((function(runnable) { return function(done) { runnable.execute(done); }; })(runnable));
+      var order = new j$.Order({
+        random: random,
+        seed: seed
+      });
+
+      var processor = new j$.TreeProcessor({
+        tree: topSuite,
+        runnableIds: runnablesToRun,
+        queueRunnerFactory: queueRunnerFactory,
+        nodeStart: function(suite) {
+          currentlyExecutingSuites.push(suite);
+          defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
+          reporter.suiteStarted(suite.result);
+        },
+        nodeComplete: function(suite, result) {
+          if (!suite.disabled) {
+            clearResourcesForRunnable(suite.id);
+          }
+          currentlyExecutingSuites.pop();
+          reporter.suiteDone(result);
+        },
+        orderChildren: function(node) {
+          return order.sort(node.children);
+        }
+      });
+
+      if(!processor.processTree().valid) {
+        throw new Error('Invalid order: would cause a beforeAll or afterAll to be run multiple times');
       }
 
       reporter.jasmineStarted({
         totalSpecsDefined: totalSpecsDefined
       });
 
-      queueRunnerFactory({fns: allFns, onComplete: reporter.jasmineDone});
+      processor.execute(function() {
+        reporter.jasmineDone({
+          order: order
+        });
+      });
     };
 
     this.addReporter = function(reporterToAdd) {
       reporter.addReporter(reporterToAdd);
     };
 
-    this.addMatchers = function(matchersToAdd) {
-      j$.Expectation.addMatchers(matchersToAdd);
-    };
-
-    this.spyOn = function(obj, methodName) {
-      if (j$.util.isUndefined(obj)) {
-        throw new Error("spyOn could not find an object to spy upon for " + methodName + "()");
+    var spyRegistry = new j$.SpyRegistry({currentSpies: function() {
+      if(!currentRunnable()) {
+        throw new Error('Spies must be created in a before function or a spec');
       }
+      return runnableResources[currentRunnable().id].spies;
+    }});
 
-      if (j$.util.isUndefined(obj[methodName])) {
-        throw new Error(methodName + '() method does not exist');
-      }
-
-      if (obj[methodName] && j$.isSpy(obj[methodName])) {
-        //TODO?: should this return the current spy? Downside: may cause user confusion about spy state
-        throw new Error(methodName + ' has already been spied upon');
-      }
-
-      var spy = j$.createSpy(methodName, obj[methodName]);
-
-      spies.push({
-        spy: spy,
-        baseObj: obj,
-        methodName: methodName,
-        originalValue: obj[methodName]
-      });
-
-      obj[methodName] = spy;
-
-      return spy;
+    this.spyOn = function() {
+      return spyRegistry.spyOn.apply(spyRegistry, arguments);
     };
 
     var suiteFactory = function(description) {
@@ -589,12 +781,10 @@ getJasmineRequireObj().Env = function(j$) {
         env: self,
         id: getNextSuiteId(),
         description: description,
-        parentSuite: currentSuite,
-        queueRunner: queueRunnerFactory,
-        onStart: suiteStarted,
-        resultCallback: function(attrs) {
-          reporter.suiteDone(attrs);
-        }
+        parentSuite: currentDeclarationSuite,
+        expectationFactory: expectationFactory,
+        expectationResultFactory: expectationResultFactory,
+        throwOnExpectationFailure: throwOnExpectationFailure
       });
 
       runnableLookupTable[suite.id] = suite;
@@ -603,10 +793,40 @@ getJasmineRequireObj().Env = function(j$) {
 
     this.describe = function(description, specDefinitions) {
       var suite = suiteFactory(description);
+      if (specDefinitions.length > 0) {
+        throw new Error('describe does not expect a done parameter');
+      }
+      if (currentDeclarationSuite.markedPending) {
+        suite.pend();
+      }
+      addSpecsToSuite(suite, specDefinitions);
+      return suite;
+    };
 
-      var parentSuite = currentSuite;
+    this.xdescribe = function(description, specDefinitions) {
+      var suite = suiteFactory(description);
+      suite.pend();
+      addSpecsToSuite(suite, specDefinitions);
+      return suite;
+    };
+
+    var focusedRunnables = [];
+
+    this.fdescribe = function(description, specDefinitions) {
+      var suite = suiteFactory(description);
+      suite.isFocused = true;
+
+      focusedRunnables.push(suite.id);
+      unfocusAncestor();
+      addSpecsToSuite(suite, specDefinitions);
+
+      return suite;
+    };
+
+    function addSpecsToSuite(suite, specDefinitions) {
+      var parentSuite = currentDeclarationSuite;
       parentSuite.addChild(suite);
-      currentSuite = suite;
+      currentDeclarationSuite = suite;
 
       var declarationError = null;
       try {
@@ -616,31 +836,43 @@ getJasmineRequireObj().Env = function(j$) {
       }
 
       if (declarationError) {
-        this.it("encountered a declaration exception", function() {
+        self.it('encountered a declaration exception', function() {
           throw declarationError;
         });
       }
 
-      currentSuite = parentSuite;
+      currentDeclarationSuite = parentSuite;
+    }
 
-      return suite;
-    };
+    function findFocusedAncestor(suite) {
+      while (suite) {
+        if (suite.isFocused) {
+          return suite.id;
+        }
+        suite = suite.parentSuite;
+      }
 
-    this.xdescribe = function(description, specDefinitions) {
-      var suite = this.describe(description, specDefinitions);
-      suite.disable();
-      return suite;
-    };
+      return null;
+    }
 
-    var specFactory = function(description, fn, suite) {
+    function unfocusAncestor() {
+      var focusedAncestor = findFocusedAncestor(currentDeclarationSuite);
+      if (focusedAncestor) {
+        for (var i = 0; i < focusedRunnables.length; i++) {
+          if (focusedRunnables[i] === focusedAncestor) {
+            focusedRunnables.splice(i, 1);
+            break;
+          }
+        }
+      }
+    }
+
+    var specFactory = function(description, fn, suite, timeout) {
       totalSpecsDefined++;
-
       var spec = new j$.Spec({
         id: getNextSpecId(),
-        beforeFns: beforeFns(suite),
-        afterFns: afterFns(suite),
+        beforeAndAfterFns: beforeAndAfterFns(suite),
         expectationFactory: expectationFactory,
-        exceptionFormatter: exceptionFormatter,
         resultCallback: specResultCallback,
         getSpecName: function(spec) {
           return getSpecName(spec, suite);
@@ -649,8 +881,12 @@ getJasmineRequireObj().Env = function(j$) {
         description: description,
         expectationResultFactory: expectationResultFactory,
         queueRunnerFactory: queueRunnerFactory,
-        fn: fn,
-        timer: {setTimeout: realSetTimeout, clearTimeout: realClearTimeout}
+        userContext: function() { return suite.clonedSharedUserContext(); },
+        queueableFn: {
+          fn: fn,
+          timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
+        },
+        throwOnExpectationFailure: throwOnExpectationFailure
       });
 
       runnableLookupTable[spec.id] = spec;
@@ -661,53 +897,101 @@ getJasmineRequireObj().Env = function(j$) {
 
       return spec;
 
-      function removeAllSpies() {
-        for (var i = 0; i < spies.length; i++) {
-          var spyEntry = spies[i];
-          spyEntry.baseObj[spyEntry.methodName] = spyEntry.originalValue;
-        }
-        spies = [];
-      }
-
       function specResultCallback(result) {
-        removeAllSpies();
-        j$.Expectation.resetMatchers();
-        customEqualityTesters = [];
+        clearResourcesForRunnable(spec.id);
         currentSpec = null;
         reporter.specDone(result);
       }
+
+      function specStarted(spec) {
+        currentSpec = spec;
+        defaultResourcesForRunnable(spec.id, suite.id);
+        reporter.specStarted(spec.result);
+      }
     };
 
-    var suiteStarted = function(suite) {
-      reporter.suiteStarted(suite.result);
-    };
-
-    this.it = function(description, fn) {
-      var spec = specFactory(description, fn, currentSuite);
-      currentSuite.addChild(spec);
+    this.it = function(description, fn, timeout) {
+      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
+      if (currentDeclarationSuite.markedPending) {
+        spec.pend();
+      }
+      currentDeclarationSuite.addChild(spec);
       return spec;
     };
 
-    this.xit = function(description, fn) {
-      var spec = this.it(description, fn);
-      spec.pend();
+    this.xit = function() {
+      var spec = this.it.apply(this, arguments);
+      spec.pend('Temporarily disabled with xit');
+      return spec;
+    };
+
+    this.fit = function(description, fn, timeout){
+      var spec = specFactory(description, fn, currentDeclarationSuite, timeout);
+      currentDeclarationSuite.addChild(spec);
+      focusedRunnables.push(spec.id);
+      unfocusAncestor();
       return spec;
     };
 
     this.expect = function(actual) {
-      return currentSpec.expect(actual);
+      if (!currentRunnable()) {
+        throw new Error('\'expect\' was used when there was no current spec, this could be because an asynchronous test timed out');
+      }
+
+      return currentRunnable().expect(actual);
     };
 
-    this.beforeEach = function(beforeEachFunction) {
-      currentSuite.beforeEach(beforeEachFunction);
+    this.beforeEach = function(beforeEachFunction, timeout) {
+      currentDeclarationSuite.beforeEach({
+        fn: beforeEachFunction,
+        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
+      });
     };
 
-    this.afterEach = function(afterEachFunction) {
-      currentSuite.afterEach(afterEachFunction);
+    this.beforeAll = function(beforeAllFunction, timeout) {
+      currentDeclarationSuite.beforeAll({
+        fn: beforeAllFunction,
+        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
+      });
     };
 
-    this.pending = function() {
-      throw j$.Spec.pendingSpecExceptionMessage;
+    this.afterEach = function(afterEachFunction, timeout) {
+      currentDeclarationSuite.afterEach({
+        fn: afterEachFunction,
+        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
+      });
+    };
+
+    this.afterAll = function(afterAllFunction, timeout) {
+      currentDeclarationSuite.afterAll({
+        fn: afterAllFunction,
+        timeout: function() { return timeout || j$.DEFAULT_TIMEOUT_INTERVAL; }
+      });
+    };
+
+    this.pending = function(message) {
+      var fullMessage = j$.Spec.pendingSpecExceptionMessage;
+      if(message) {
+        fullMessage += message;
+      }
+      throw fullMessage;
+    };
+
+    this.fail = function(error) {
+      var message = 'Failed';
+      if (error) {
+        message += ': ';
+        message += error.message || error;
+      }
+
+      currentRunnable().addExpectationResult(false, {
+        matcherName: '',
+        passed: false,
+        expected: '',
+        actual: '',
+        message: message,
+        error: error && error.message ? error : null
+      });
     };
   }
 
@@ -723,10 +1007,11 @@ getJasmineRequireObj().JsApiReporter = function() {
 
   function JsApiReporter(options) {
     var timer = options.timer || noopTimer,
-        status = "loaded";
+      status = 'loaded';
 
     this.started = false;
     this.finished = false;
+    this.runDetails = {};
 
     this.jasmineStarted = function() {
       this.started = true;
@@ -736,8 +1021,9 @@ getJasmineRequireObj().JsApiReporter = function() {
 
     var executionTime;
 
-    this.jasmineDone = function() {
+    this.jasmineDone = function(runDetails) {
       this.finished = true;
+      this.runDetails = runDetails;
       executionTime = timer.elapsed();
       status = 'done';
     };
@@ -746,26 +1032,31 @@ getJasmineRequireObj().JsApiReporter = function() {
       return status;
     };
 
-    var suites = {};
+    var suites = [],
+      suites_hash = {};
 
     this.suiteStarted = function(result) {
-      storeSuite(result);
+      suites_hash[result.id] = result;
     };
 
     this.suiteDone = function(result) {
       storeSuite(result);
     };
 
+    this.suiteResults = function(index, length) {
+      return suites.slice(index, index + length);
+    };
+
     function storeSuite(result) {
-      suites[result.id] = result;
+      suites.push(result);
+      suites_hash[result.id] = result;
     }
 
     this.suites = function() {
-      return suites;
+      return suites_hash;
     };
 
     var specs = [];
-    this.specStarted = function(result) { };
 
     this.specDone = function(result) {
       specs.push(result);
@@ -788,43 +1079,6 @@ getJasmineRequireObj().JsApiReporter = function() {
   return JsApiReporter;
 };
 
-getJasmineRequireObj().Any = function() {
-
-  function Any(expectedObject) {
-    this.expectedObject = expectedObject;
-  }
-
-  Any.prototype.jasmineMatches = function(other) {
-    if (this.expectedObject == String) {
-      return typeof other == 'string' || other instanceof String;
-    }
-
-    if (this.expectedObject == Number) {
-      return typeof other == 'number' || other instanceof Number;
-    }
-
-    if (this.expectedObject == Function) {
-      return typeof other == 'function' || other instanceof Function;
-    }
-
-    if (this.expectedObject == Object) {
-      return typeof other == 'object';
-    }
-    
-    if (this.expectedObject == Boolean) {
-      return typeof other == 'boolean';
-    }
-
-    return other instanceof this.expectedObject;
-  };
-
-  Any.prototype.jasmineToString = function() {
-    return '<jasmine.any(' + this.expectedClass + ')>';
-  };
-
-  return Any;
-};
-
 getJasmineRequireObj().CallTracker = function() {
 
   function CallTracker() {
@@ -877,7 +1131,7 @@ getJasmineRequireObj().CallTracker = function() {
 };
 
 getJasmineRequireObj().Clock = function() {
-  function Clock(global, delayedFunctionScheduler) {
+  function Clock(global, delayedFunctionSchedulerFactory, mockDate) {
     var self = this,
       realTimingFunctions = {
         setTimeout: global.setTimeout,
@@ -892,25 +1146,48 @@ getJasmineRequireObj().Clock = function() {
         clearInterval: clearInterval
       },
       installed = false,
+      delayedFunctionScheduler,
       timer;
 
+
     self.install = function() {
+      if(!originalTimingFunctionsIntact()) {
+        throw new Error('Jasmine Clock was unable to install over custom global timer functions. Is the clock already installed?');
+      }
       replace(global, fakeTimingFunctions);
       timer = fakeTimingFunctions;
+      delayedFunctionScheduler = delayedFunctionSchedulerFactory();
       installed = true;
+
+      return self;
     };
 
     self.uninstall = function() {
-      delayedFunctionScheduler.reset();
+      delayedFunctionScheduler = null;
+      mockDate.uninstall();
       replace(global, realTimingFunctions);
+
       timer = realTimingFunctions;
       installed = false;
     };
 
+    self.withMock = function(closure) {
+      this.install();
+      try {
+        closure();
+      } finally {
+        this.uninstall();
+      }
+    };
+
+    self.mockDate = function(initialDate) {
+      mockDate.install(initialDate);
+    };
+
     self.setTimeout = function(fn, delay, params) {
       if (legacyIE()) {
         if (arguments.length > 2) {
-          throw new Error("IE < 9 cannot support extra params to setTimeout without a polyfill");
+          throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill');
         }
         return timer.setTimeout(fn, delay);
       }
@@ -920,7 +1197,7 @@ getJasmineRequireObj().Clock = function() {
     self.setInterval = function(fn, delay, params) {
       if (legacyIE()) {
         if (arguments.length > 2) {
-          throw new Error("IE < 9 cannot support extra params to setInterval without a polyfill");
+          throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill');
         }
         return timer.setInterval(fn, delay);
       }
@@ -937,14 +1214,21 @@ getJasmineRequireObj().Clock = function() {
 
     self.tick = function(millis) {
       if (installed) {
-        delayedFunctionScheduler.tick(millis);
+        delayedFunctionScheduler.tick(millis, function(millis) { mockDate.tick(millis); });
       } else {
-        throw new Error("Mock clock is not installed, use jasmine.clock().install()");
+        throw new Error('Mock clock is not installed, use jasmine.clock().install()');
       }
     };
 
     return self;
 
+    function originalTimingFunctionsIntact() {
+      return global.setTimeout === realTimingFunctions.setTimeout &&
+        global.clearTimeout === realTimingFunctions.clearTimeout &&
+        global.setInterval === realTimingFunctions.setInterval &&
+        global.clearInterval === realTimingFunctions.clearInterval;
+    }
+
     function legacyIE() {
       //if these methods are polyfilled, apply will be present
       return !(realTimingFunctions.setTimeout || realTimingFunctions.setInterval).apply;
@@ -973,7 +1257,7 @@ getJasmineRequireObj().Clock = function() {
     }
 
     function argSlice(argsObj, n) {
-      return Array.prototype.slice.call(argsObj, 2);
+      return Array.prototype.slice.call(argsObj, n);
     }
   }
 
@@ -988,11 +1272,11 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
     var currentTime = 0;
     var delayedFnCount = 0;
 
-    self.tick = function(millis) {
+    self.tick = function(millis, tickDate) {
       millis = millis || 0;
       var endTime = currentTime + millis;
 
-      runScheduledFunctions(endTime);
+      runScheduledFunctions(endTime, tickDate);
       currentTime = endTime;
     };
 
@@ -1054,13 +1338,6 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
       }
     };
 
-    self.reset = function() {
-      currentTime = 0;
-      scheduledLookup = [];
-      scheduledFunctions = {};
-      delayedFnCount = 0;
-    };
-
     return self;
 
     function indexOfFirstToPass(array, testFn) {
@@ -1096,30 +1373,42 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
         scheduledFn.runAtMillis + scheduledFn.millis);
     }
 
-    function runScheduledFunctions(endTime) {
+    function forEachFunction(funcsToRun, callback) {
+      for (var i = 0; i < funcsToRun.length; ++i) {
+        callback(funcsToRun[i]);
+      }
+    }
+
+    function runScheduledFunctions(endTime, tickDate) {
+      tickDate = tickDate || function() {};
       if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) {
+        tickDate(endTime);
         return;
       }
 
       do {
-        currentTime = scheduledLookup.shift();
+        var newCurrentTime = scheduledLookup.shift();
+        tickDate(newCurrentTime - currentTime);
+
+        currentTime = newCurrentTime;
 
         var funcsToRun = scheduledFunctions[currentTime];
         delete scheduledFunctions[currentTime];
 
-        for (var i = 0; i < funcsToRun.length; ++i) {
-          var funcToRun = funcsToRun[i];
-          funcToRun.funcToCall.apply(null, funcToRun.params || []);
-
+        forEachFunction(funcsToRun, function(funcToRun) {
           if (funcToRun.recurring) {
             reschedule(funcToRun);
           }
-        }
+        });
+
+        forEachFunction(funcsToRun, function(funcToRun) {
+          funcToRun.funcToCall.apply(null, funcToRun.params || []);
+        });
       } while (scheduledLookup.length > 0 &&
-              // checking first if we're out of time prevents setTimeout(0)
-              // scheduled in a funcToRun from forcing an extra iteration
-                 currentTime !== endTime  &&
-                 scheduledLookup[0] <= endTime);
+        // checking first if we're out of time prevents setTimeout(0)
+        // scheduled in a funcToRun from forcing an extra iteration
+      currentTime !== endTime  &&
+      scheduledLookup[0] <= endTime);
     }
   }
 
@@ -1129,16 +1418,20 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
 getJasmineRequireObj().ExceptionFormatter = function() {
   function ExceptionFormatter() {
     this.message = function(error) {
-      var message = error.name +
-        ': ' +
-        error.message;
+      var message = '';
+
+      if (error.name && error.message) {
+        message += error.name + ': ' + error.message;
+      } else {
+        message += error.toString() + ' thrown';
+      }
 
       if (error.fileName || error.sourceURL) {
-        message += " in " + (error.fileName || error.sourceURL);
+        message += ' in ' + (error.fileName || error.sourceURL);
       }
 
       if (error.line || error.lineNumber) {
-        message += " (line " + (error.line || error.lineNumber) + ")";
+        message += ' (line ' + (error.line || error.lineNumber) + ')';
       }
 
       return message;
@@ -1154,8 +1447,6 @@ getJasmineRequireObj().ExceptionFormatter = function() {
 
 getJasmineRequireObj().Expectation = function() {
 
-  var matchers = {};
-
   function Expectation(options) {
     this.util = options.util || { buildFailureMessage: function() {} };
     this.customEqualityTesters = options.customEqualityTesters || [];
@@ -1163,8 +1454,9 @@ getJasmineRequireObj().Expectation = function() {
     this.addExpectationResult = options.addExpectationResult || function(){};
     this.isNot = options.isNot;
 
-    for (var matcherName in matchers) {
-      this[matcherName] = matchers[matcherName];
+    var customMatchers = options.customMatchers || {};
+    for (var matcherName in customMatchers) {
+      this[matcherName] = Expectation.prototype.wrapCompare(matcherName, customMatchers[matcherName]);
     }
   }
 
@@ -1172,12 +1464,12 @@ getJasmineRequireObj().Expectation = function() {
     return function() {
       var args = Array.prototype.slice.call(arguments, 0),
         expected = args.slice(0),
-        message = "";
+        message = '';
 
       args.unshift(this.actual);
 
       var matcher = matcherFactory(this.util, this.customEqualityTesters),
-          matcherCompare = matcher.compare;
+        matcherCompare = matcher.compare;
 
       function defaultNegativeCompare() {
         var result = matcher.compare.apply(null, args);
@@ -1197,7 +1489,11 @@ getJasmineRequireObj().Expectation = function() {
           args.unshift(name);
           message = this.util.buildFailureMessage.apply(null, args);
         } else {
-          message = result.message;
+          if (Object.prototype.toString.apply(result.message) === '[object Function]') {
+            message = result.message();
+          } else {
+            message = result.message;
+          }
         }
       }
 
@@ -1227,19 +1523,6 @@ getJasmineRequireObj().Expectation = function() {
     }
   };
 
-  Expectation.addMatchers = function(matchersToAdd) {
-    for (var name in matchersToAdd) {
-      var matcher = matchersToAdd[name];
-      matchers[name] = Expectation.prototype.wrapCompare(name, matcher);
-    }
-  };
-
-  Expectation.resetMatchers = function() {
-    for (var name in matchers) {
-      delete matchers[name];
-    }
-  };
-
   Expectation.Factory = function(options) {
     options = options || {};
 
@@ -1262,29 +1545,34 @@ getJasmineRequireObj().buildExpectationResult = function() {
     var messageFormatter = options.messageFormatter || function() {},
       stackFormatter = options.stackFormatter || function() {};
 
-    return {
+    var result = {
       matcherName: options.matcherName,
-      expected: options.expected,
-      actual: options.actual,
       message: message(),
       stack: stack(),
       passed: options.passed
     };
 
+    if(!result.passed) {
+      result.expected = options.expected;
+      result.actual = options.actual;
+    }
+
+    return result;
+
     function message() {
       if (options.passed) {
-        return "Passed.";
+        return 'Passed.';
       } else if (options.message) {
         return options.message;
       } else if (options.error) {
         return messageFormatter(options.error);
       }
-      return "";
+      return '';
     }
 
     function stack() {
       if (options.passed) {
-        return "";
+        return '';
       }
 
       var error = options.error;
@@ -1302,45 +1590,94 @@ getJasmineRequireObj().buildExpectationResult = function() {
   return buildExpectationResult;
 };
 
-getJasmineRequireObj().ObjectContaining = function(j$) {
+getJasmineRequireObj().MockDate = function() {
+  function MockDate(global) {
+    var self = this;
+    var currentTime = 0;
 
-  function ObjectContaining(sample) {
-    this.sample = sample;
-  }
+    if (!global || !global.Date) {
+      self.install = function() {};
+      self.tick = function() {};
+      self.uninstall = function() {};
+      return self;
+    }
 
-  ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) {
-    if (typeof(this.sample) !== "object") { throw new Error("You must provide an object to objectContaining, not '"+this.sample+"'."); }
+    var GlobalDate = global.Date;
 
-    mismatchKeys = mismatchKeys || [];
-    mismatchValues = mismatchValues || [];
+    self.install = function(mockDate) {
+      if (mockDate instanceof GlobalDate) {
+        currentTime = mockDate.getTime();
+      } else {
+        currentTime = new GlobalDate().getTime();
+      }
 
-    var hasKey = function(obj, keyName) {
-      return obj !== null && !j$.util.isUndefined(obj[keyName]);
+      global.Date = FakeDate;
     };
 
-    for (var property in this.sample) {
-      if (!hasKey(other, property) && hasKey(this.sample, property)) {
-        mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
-      }
-      else if (!j$.matchersUtil.equals(this.sample[property], other[property])) {
-        mismatchValues.push("'" + property + "' was '" + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + "' in actual, but was '" + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in expected.");
+    self.tick = function(millis) {
+      millis = millis || 0;
+      currentTime = currentTime + millis;
+    };
+
+    self.uninstall = function() {
+      currentTime = 0;
+      global.Date = GlobalDate;
+    };
+
+    createDateProperties();
+
+    return self;
+
+    function FakeDate() {
+      switch(arguments.length) {
+        case 0:
+          return new GlobalDate(currentTime);
+        case 1:
+          return new GlobalDate(arguments[0]);
+        case 2:
+          return new GlobalDate(arguments[0], arguments[1]);
+        case 3:
+          return new GlobalDate(arguments[0], arguments[1], arguments[2]);
+        case 4:
+          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3]);
+        case 5:
+          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
+            arguments[4]);
+        case 6:
+          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
+            arguments[4], arguments[5]);
+        default:
+          return new GlobalDate(arguments[0], arguments[1], arguments[2], arguments[3],
+            arguments[4], arguments[5], arguments[6]);
       }
     }
 
-    return (mismatchKeys.length === 0 && mismatchValues.length === 0);
-  };
+    function createDateProperties() {
+      FakeDate.prototype = GlobalDate.prototype;
 
-  ObjectContaining.prototype.jasmineToString = function() {
-    return "<jasmine.objectContaining(" + j$.pp(this.sample) + ")>";
-  };
+      FakeDate.now = function() {
+        if (GlobalDate.now) {
+          return currentTime;
+        } else {
+          throw new Error('Browser does not support Date.now()');
+        }
+      };
 
-  return ObjectContaining;
+      FakeDate.toSource = GlobalDate.toSource;
+      FakeDate.toString = GlobalDate.toString;
+      FakeDate.parse = GlobalDate.parse;
+      FakeDate.UTC = GlobalDate.UTC;
+    }
+  }
+
+  return MockDate;
 };
 
 getJasmineRequireObj().pp = function(j$) {
 
   function PrettyPrinter() {
     this.ppNestLevel_ = 0;
+    this.seen = [];
   }
 
   PrettyPrinter.prototype.format = function(value) {
@@ -1350,6 +1687,8 @@ getJasmineRequireObj().pp = function(j$) {
         this.emitScalar('undefined');
       } else if (value === null) {
         this.emitScalar('null');
+      } else if (value === 0 && 1/value === -Infinity) {
+        this.emitScalar('-0');
       } else if (value === j$.getGlobal()) {
         this.emitScalar('<global>');
       } else if (value.jasmineToString) {
@@ -1357,7 +1696,7 @@ getJasmineRequireObj().pp = function(j$) {
       } else if (typeof value === 'string') {
         this.emitString(value);
       } else if (j$.isSpy(value)) {
-        this.emitScalar("spy on " + value.and.identity());
+        this.emitScalar('spy on ' + value.and.identity());
       } else if (value instanceof RegExp) {
         this.emitScalar(value.toString());
       } else if (typeof value === 'function') {
@@ -1366,16 +1705,18 @@ getJasmineRequireObj().pp = function(j$) {
         this.emitScalar('HTMLNode');
       } else if (value instanceof Date) {
         this.emitScalar('Date(' + value + ')');
-      } else if (value.__Jasmine_been_here_before__) {
+      } else if (value.toString && typeof value === 'object' && !(value instanceof Array) && value.toString !== Object.prototype.toString) {
+        this.emitScalar(value.toString());
+      } else if (j$.util.arrayContains(this.seen, value)) {
         this.emitScalar('<circular reference: ' + (j$.isArray_(value) ? 'Array' : 'Object') + '>');
       } else if (j$.isArray_(value) || j$.isA_('Object', value)) {
-        value.__Jasmine_been_here_before__ = true;
+        this.seen.push(value);
         if (j$.isArray_(value)) {
           this.emitArray(value);
         } else {
           this.emitObject(value);
         }
-        delete value.__Jasmine_been_here_before__;
+        this.seen.pop();
       } else {
         this.emitScalar(value.toString());
       }
@@ -1386,10 +1727,9 @@ getJasmineRequireObj().pp = function(j$) {
 
   PrettyPrinter.prototype.iterateObject = function(obj, fn) {
     for (var property in obj) {
-      if (!obj.hasOwnProperty(property)) { continue; }
-      if (property == '__Jasmine_been_here_before__') { continue; }
+      if (!Object.prototype.hasOwnProperty.call(obj, property)) { continue; }
       fn(property, obj.__lookupGetter__ ? (!j$.util.isUndefined(obj.__lookupGetter__(property)) &&
-          obj.__lookupGetter__(property) !== null) : false);
+      obj.__lookupGetter__(property) !== null) : false);
     }
   };
 
@@ -1411,33 +1751,55 @@ getJasmineRequireObj().pp = function(j$) {
   };
 
   StringPrettyPrinter.prototype.emitString = function(value) {
-    this.append("'" + value + "'");
+    this.append('\'' + value + '\'');
   };
 
   StringPrettyPrinter.prototype.emitArray = function(array) {
     if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
-      this.append("Array");
+      this.append('Array');
       return;
     }
-
+    var length = Math.min(array.length, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH);
     this.append('[ ');
-    for (var i = 0; i < array.length; i++) {
+    for (var i = 0; i < length; i++) {
       if (i > 0) {
         this.append(', ');
       }
       this.format(array[i]);
     }
+    if(array.length > length){
+      this.append(', ...');
+    }
+
+    var self = this;
+    var first = array.length === 0;
+    this.iterateObject(array, function(property, isGetter) {
+      if (property.match(/^\d+$/)) {
+        return;
+      }
+
+      if (first) {
+        first = false;
+      } else {
+        self.append(', ');
+      }
+
+      self.formatProperty(array, property, isGetter);
+    });
+
     this.append(' ]');
   };
 
   StringPrettyPrinter.prototype.emitObject = function(obj) {
+    var constructorName = obj.constructor ? j$.fnNameFor(obj.constructor) : 'null';
+    this.append(constructorName);
+
     if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
-      this.append("Object");
       return;
     }
 
     var self = this;
-    this.append('{ ');
+    this.append('({ ');
     var first = true;
 
     this.iterateObject(obj, function(property, isGetter) {
@@ -1447,16 +1809,20 @@ getJasmineRequireObj().pp = function(j$) {
         self.append(', ');
       }
 
-      self.append(property);
-      self.append(' : ');
-      if (isGetter) {
-        self.append('<getter>');
-      } else {
-        self.format(obj[property]);
-      }
+      self.formatProperty(obj, property, isGetter);
     });
 
-    this.append(' }');
+    this.append(' })');
+  };
+
+  StringPrettyPrinter.prototype.formatProperty = function(obj, property, isGetter) {
+    this.append(property);
+    this.append(': ');
+    if (isGetter) {
+      this.append('<getter>');
+    } else {
+      this.format(obj[property]);
+    }
   };
 
   StringPrettyPrinter.prototype.append = function(value) {
@@ -1470,32 +1836,46 @@ getJasmineRequireObj().pp = function(j$) {
   };
 };
 
-getJasmineRequireObj().QueueRunner = function() {
+getJasmineRequireObj().QueueRunner = function(j$) {
+
+  function once(fn) {
+    var called = false;
+    return function() {
+      if (!called) {
+        called = true;
+        fn();
+      }
+    };
+  }
 
   function QueueRunner(attrs) {
-    this.fns = attrs.fns || [];
+    this.queueableFns = attrs.queueableFns || [];
     this.onComplete = attrs.onComplete || function() {};
     this.clearStack = attrs.clearStack || function(fn) {fn();};
     this.onException = attrs.onException || function() {};
     this.catchException = attrs.catchException || function() { return true; };
-    this.userContext = {};
+    this.userContext = attrs.userContext || {};
+    this.timeout = attrs.timeout || {setTimeout: setTimeout, clearTimeout: clearTimeout};
+    this.fail = attrs.fail || function() {};
   }
 
   QueueRunner.prototype.execute = function() {
-    this.run(this.fns, 0);
+    this.run(this.queueableFns, 0);
   };
 
-  QueueRunner.prototype.run = function(fns, recursiveIndex) {
-    var length = fns.length,
-        self = this,
-        iterativeIndex;
+  QueueRunner.prototype.run = function(queueableFns, recursiveIndex) {
+    var length = queueableFns.length,
+      self = this,
+      iterativeIndex;
+
 
     for(iterativeIndex = recursiveIndex; iterativeIndex < length; iterativeIndex++) {
-      var fn = fns[iterativeIndex];
-      if (fn.length > 0) {
-        return attemptAsync(fn);
+      var queueableFn = queueableFns[iterativeIndex];
+      if (queueableFn.fn.length > 0) {
+        attemptAsync(queueableFn);
+        return;
       } else {
-        attemptSync(fn);
+        attemptSync(queueableFn);
       }
     }
 
@@ -1505,27 +1885,51 @@ getJasmineRequireObj().QueueRunner = function() {
       this.clearStack(this.onComplete);
     }
 
-    function attemptSync(fn) {
+    function attemptSync(queueableFn) {
       try {
-        fn.call(self.userContext);
+        queueableFn.fn.call(self.userContext);
       } catch (e) {
-        handleException(e);
+        handleException(e, queueableFn);
       }
     }
 
-    function attemptAsync(fn) {
-      var next = function () { self.run(fns, iterativeIndex + 1); };
+    function attemptAsync(queueableFn) {
+      var clearTimeout = function () {
+          Function.prototype.apply.apply(self.timeout.clearTimeout, [j$.getGlobal(), [timeoutId]]);
+        },
+        next = once(function () {
+          clearTimeout(timeoutId);
+          self.run(queueableFns, iterativeIndex + 1);
+        }),
+        timeoutId;
+
+      next.fail = function() {
+        self.fail.apply(null, arguments);
+        next();
+      };
+
+      if (queueableFn.timeout) {
+        timeoutId = Function.prototype.apply.apply(self.timeout.setTimeout, [j$.getGlobal(), [function() {
+          var error = new Error('Timeout - Async callback was not invoked within timeout specified by jasmine.DEFAULT_TIMEOUT_INTERVAL.');
+          onException(error);
+          next();
+        }, queueableFn.timeout()]]);
+      }
 
       try {
-        fn.call(self.userContext, next);
+        queueableFn.fn.call(self.userContext, next);
       } catch (e) {
-        handleException(e);
+        handleException(e, queueableFn);
         next();
       }
     }
 
-    function handleException(e) {
+    function onException(e) {
       self.onException(e);
+    }
+
+    function handleException(e, queueableFn) {
+      onException(e);
       if (!self.catchException(e)) {
         //TODO: set a var when we catch an exception and
         //use a finally block to close the loop in a nice way..
@@ -1573,15 +1977,76 @@ getJasmineRequireObj().ReportDispatcher = function() {
 };
 
 
+getJasmineRequireObj().SpyRegistry = function(j$) {
+
+  function SpyRegistry(options) {
+    options = options || {};
+    var currentSpies = options.currentSpies || function() { return []; };
+
+    this.spyOn = function(obj, methodName) {
+      if (j$.util.isUndefined(obj)) {
+        throw new Error('spyOn could not find an object to spy upon for ' + methodName + '()');
+      }
+
+      if (j$.util.isUndefined(methodName)) {
+        throw new Error('No method name supplied');
+      }
+
+      if (j$.util.isUndefined(obj[methodName])) {
+        throw new Error(methodName + '() method does not exist');
+      }
+
+      if (obj[methodName] && j$.isSpy(obj[methodName])) {
+        //TODO?: should this return the current spy? Downside: may cause user confusion about spy state
+        throw new Error(methodName + ' has already been spied upon');
+      }
+
+      var descriptor;
+      try {
+        descriptor = Object.getOwnPropertyDescriptor(obj, methodName);
+      } catch(e) {
+        // IE 8 doesn't support `definePropery` on non-DOM nodes
+      }
+
+      if (descriptor && !(descriptor.writable || descriptor.set)) {
+        throw new Error(methodName + ' is not declared writable or has no setter');
+      }
+
+      var spy = j$.createSpy(methodName, obj[methodName]);
+
+      currentSpies().push({
+        spy: spy,
+        baseObj: obj,
+        methodName: methodName,
+        originalValue: obj[methodName]
+      });
+
+      obj[methodName] = spy;
+
+      return spy;
+    };
+
+    this.clearSpies = function() {
+      var spies = currentSpies();
+      for (var i = 0; i < spies.length; i++) {
+        var spyEntry = spies[i];
+        spyEntry.baseObj[spyEntry.methodName] = spyEntry.originalValue;
+      }
+    };
+  }
+
+  return SpyRegistry;
+};
+
 getJasmineRequireObj().SpyStrategy = function() {
 
   function SpyStrategy(options) {
     options = options || {};
 
-    var identity = options.name || "unknown",
-        originalFn = options.fn || function() {},
-        getSpy = options.getSpy || function() {},
-        plan = function() {};
+    var identity = options.name || 'unknown',
+      originalFn = options.fn || function() {},
+      getSpy = options.getSpy || function() {},
+      plan = function() {};
 
     this.identity = function() {
       return identity;
@@ -1603,6 +2068,14 @@ getJasmineRequireObj().SpyStrategy = function() {
       return getSpy();
     };
 
+    this.returnValues = function() {
+      var values = Array.prototype.slice.call(arguments);
+      plan = function () {
+        return values.shift();
+      };
+      return getSpy();
+    };
+
     this.throwError = function(something) {
       var error = (something instanceof Error) ? something : new Error(something);
       plan = function() {
@@ -1625,31 +2098,36 @@ getJasmineRequireObj().SpyStrategy = function() {
   return SpyStrategy;
 };
 
-getJasmineRequireObj().Suite = function() {
+getJasmineRequireObj().Suite = function(j$) {
   function Suite(attrs) {
     this.env = attrs.env;
     this.id = attrs.id;
     this.parentSuite = attrs.parentSuite;
     this.description = attrs.description;
-    this.onStart = attrs.onStart || function() {};
-    this.resultCallback = attrs.resultCallback || function() {};
-    this.clearStack = attrs.clearStack || function(fn) {fn();};
+    this.expectationFactory = attrs.expectationFactory;
+    this.expectationResultFactory = attrs.expectationResultFactory;
+    this.throwOnExpectationFailure = !!attrs.throwOnExpectationFailure;
 
     this.beforeFns = [];
     this.afterFns = [];
-    this.queueRunner = attrs.queueRunner || function() {};
+    this.beforeAllFns = [];
+    this.afterAllFns = [];
     this.disabled = false;
 
     this.children = [];
 
     this.result = {
       id: this.id,
-      status: this.disabled ? 'disabled' : '',
       description: this.description,
-      fullName: this.getFullName()
+      fullName: this.getFullName(),
+      failedExpectations: []
     };
   }
 
+  Suite.prototype.expect = function(actual) {
+    return this.expectationFactory(actual, this);
+  };
+
   Suite.prototype.getFullName = function() {
     var fullName = this.description;
     for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
@@ -1664,64 +2142,148 @@ getJasmineRequireObj().Suite = function() {
     this.disabled = true;
   };
 
+  Suite.prototype.pend = function(message) {
+    this.markedPending = true;
+  };
+
   Suite.prototype.beforeEach = function(fn) {
     this.beforeFns.unshift(fn);
   };
 
+  Suite.prototype.beforeAll = function(fn) {
+    this.beforeAllFns.push(fn);
+  };
+
   Suite.prototype.afterEach = function(fn) {
     this.afterFns.unshift(fn);
   };
 
+  Suite.prototype.afterAll = function(fn) {
+    this.afterAllFns.push(fn);
+  };
+
   Suite.prototype.addChild = function(child) {
     this.children.push(child);
   };
 
-  Suite.prototype.execute = function(onComplete) {
-    var self = this;
+  Suite.prototype.status = function() {
     if (this.disabled) {
-      complete();
+      return 'disabled';
+    }
+
+    if (this.markedPending) {
+      return 'pending';
+    }
+
+    if (this.result.failedExpectations.length > 0) {
+      return 'failed';
+    } else {
+      return 'finished';
+    }
+  };
+
+  Suite.prototype.isExecutable = function() {
+    return !this.disabled;
+  };
+
+  Suite.prototype.canBeReentered = function() {
+    return this.beforeAllFns.length === 0 && this.afterAllFns.length === 0;
+  };
+
+  Suite.prototype.getResult = function() {
+    this.result.status = this.status();
+    return this.result;
+  };
+
+  Suite.prototype.sharedUserContext = function() {
+    if (!this.sharedContext) {
+      this.sharedContext = this.parentSuite ? clone(this.parentSuite.sharedUserContext()) : {};
+    }
+
+    return this.sharedContext;
+  };
+
+  Suite.prototype.clonedSharedUserContext = function() {
+    return clone(this.sharedUserContext());
+  };
+
+  Suite.prototype.onException = function() {
+    if (arguments[0] instanceof j$.errors.ExpectationFailed) {
       return;
     }
 
-    var allFns = [];
-
-    for (var i = 0; i < this.children.length; i++) {
-      allFns.push(wrapChildAsAsync(this.children[i]));
+    if(isAfterAll(this.children)) {
+      var data = {
+        matcherName: '',
+        passed: false,
+        expected: '',
+        actual: '',
+        error: arguments[0]
+      };
+      this.result.failedExpectations.push(this.expectationResultFactory(data));
+    } else {
+      for (var i = 0; i < this.children.length; i++) {
+        var child = this.children[i];
+        child.onException.apply(child, arguments);
+      }
     }
+  };
 
-    this.onStart(this);
+  Suite.prototype.addExpectationResult = function () {
+    if(isAfterAll(this.children) && isFailure(arguments)){
+      var data = arguments[1];
+      this.result.failedExpectations.push(this.expectationResultFactory(data));
+      if(this.throwOnExpectationFailure) {
+        throw new j$.errors.ExpectationFailed();
+      }
+    } else {
+      for (var i = 0; i < this.children.length; i++) {
+        var child = this.children[i];
+        try {
+          child.addExpectationResult.apply(child, arguments);
+        } catch(e) {
+          // keep going
+        }
+      }
+    }
+  };
 
-    this.queueRunner({
-      fns: allFns,
-      onComplete: complete
-    });
+  function isAfterAll(children) {
+    return children && children[0].result.status;
+  }
 
-    function complete() {
-      self.resultCallback(self.result);
+  function isFailure(args) {
+    return !args[0];
+  }
 
-      if (onComplete) {
-        onComplete();
+  function clone(obj) {
+    var clonedObj = {};
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        clonedObj[prop] = obj[prop];
       }
     }
 
-    function wrapChildAsAsync(child) {
-      return function(done) { child.execute(done); };
-    }
-  };
+    return clonedObj;
+  }
 
   return Suite;
 };
 
-if (typeof window == void 0 && typeof exports == "object") {
+if (typeof window == void 0 && typeof exports == 'object') {
   exports.Suite = jasmineRequire.Suite;
 }
 
 getJasmineRequireObj().Timer = function() {
+  var defaultNow = (function(Date) {
+    return function() { return new Date().getTime(); };
+  })(Date);
+
   function Timer(options) {
     options = options || {};
 
-    var now = options.now || function() { return new Date().getTime(); },
-        startTime;
+    var now = options.now || defaultNow,
+      startTime;
 
     this.start = function() {
       startTime = now();
@@ -1735,6 +2297,378 @@ getJasmineRequireObj().Timer = function() {
   return Timer;
 };
 
+getJasmineRequireObj().TreeProcessor = function() {
+  function TreeProcessor(attrs) {
+    var tree = attrs.tree,
+      runnableIds = attrs.runnableIds,
+      queueRunnerFactory = attrs.queueRunnerFactory,
+      nodeStart = attrs.nodeStart || function() {},
+      nodeComplete = attrs.nodeComplete || function() {},
+      orderChildren = attrs.orderChildren || function(node) { return node.children; },
+      stats = { valid: true },
+      processed = false,
+      defaultMin = Infinity,
+      defaultMax = 1 - Infinity;
+
+    this.processTree = function() {
+      processNode(tree, false);
+      processed = true;
+      return stats;
+    };
+
+    this.execute = function(done) {
+      if (!processed) {
+        this.processTree();
+      }
+
+      if (!stats.valid) {
+        throw 'invalid order';
+      }
+
+      var childFns = wrapChildren(tree, 0);
+
+      queueRunnerFactory({
+        queueableFns: childFns,
+        userContext: tree.sharedUserContext(),
+        onException: function() {
+          tree.onException.apply(tree, arguments);
+        },
+        onComplete: done
+      });
+    };
+
+    function runnableIndex(id) {
+      for (var i = 0; i < runnableIds.length; i++) {
+        if (runnableIds[i] === id) {
+          return i;
+        }
+      }
+    }
+
+    function processNode(node, parentEnabled) {
+      var executableIndex = runnableIndex(node.id);
+
+      if (executableIndex !== undefined) {
+        parentEnabled = true;
+      }
+
+      parentEnabled = parentEnabled && node.isExecutable();
+
+      if (!node.children) {
+        stats[node.id] = {
+          executable: parentEnabled && node.isExecutable(),
+          segments: [{
+            index: 0,
+            owner: node,
+            nodes: [node],
+            min: startingMin(executableIndex),
+            max: startingMax(executableIndex)
+          }]
+        };
+      } else {
+        var hasExecutableChild = false;
+
+        var orderedChildren = orderChildren(node);
+
+        for (var i = 0; i < orderedChildren.length; i++) {
+          var child = orderedChildren[i];
+
+          processNode(child, parentEnabled);
+
+          if (!stats.valid) {
+            return;
+          }
+
+          var childStats = stats[child.id];
+
+          hasExecutableChild = hasExecutableChild || childStats.executable;
+        }
+
+        stats[node.id] = {
+          executable: hasExecutableChild
+        };
+
+        segmentChildren(node, orderedChildren, stats[node.id], executableIndex);
+
+        if (!node.canBeReentered() && stats[node.id].segments.length > 1) {
+          stats = { valid: false };
+        }
+      }
+    }
+
+    function startingMin(executableIndex) {
+      return executableIndex === undefined ? defaultMin : executableIndex;
+    }
+
+    function startingMax(executableIndex) {
+      return executableIndex === undefined ? defaultMax : executableIndex;
+    }
+
+    function segmentChildren(node, orderedChildren, nodeStats, executableIndex) {
+      var currentSegment = { index: 0, owner: node, nodes: [], min: startingMin(executableIndex), max: startingMax(executableIndex) },
+        result = [currentSegment],
+        lastMax = defaultMax,
+        orderedChildSegments = orderChildSegments(orderedChildren);
+
+      function isSegmentBoundary(minIndex) {
+        return lastMax !== defaultMax && minIndex !== defaultMin && lastMax < minIndex - 1;
+      }
+
+      for (var i = 0; i < orderedChildSegments.length; i++) {
+        var childSegment = orderedChildSegments[i],
+          maxIndex = childSegment.max,
+          minIndex = childSegment.min;
+
+        if (isSegmentBoundary(minIndex)) {
+          currentSegment = {index: result.length, owner: node, nodes: [], min: defaultMin, max: defaultMax};
+          result.push(currentSegment);
+        }
+
+        currentSegment.nodes.push(childSegment);
+        currentSegment.min = Math.min(currentSegment.min, minIndex);
+        currentSegment.max = Math.max(currentSegment.max, maxIndex);
+        lastMax = maxIndex;
+      }
+
+      nodeStats.segments = result;
+    }
+
+    function orderChildSegments(children) {
+      var specifiedOrder = [],
+        unspecifiedOrder = [];
+
+      for (var i = 0; i < children.length; i++) {
+        var child = children[i],
+          segments = stats[child.id].segments;
+
+        for (var j = 0; j < segments.length; j++) {
+          var seg = segments[j];
+
+          if (seg.min === defaultMin) {
+            unspecifiedOrder.push(seg);
+          } else {
+            specifiedOrder.push(seg);
+          }
+        }
+      }
+
+      specifiedOrder.sort(function(a, b) {
+        return a.min - b.min;
+      });
+
+      return specifiedOrder.concat(unspecifiedOrder);
+    }
+
+    function executeNode(node, segmentNumber) {
+      if (node.children) {
+        return {
+          fn: function(done) {
+            nodeStart(node);
+
+            queueRunnerFactory({
+              onComplete: function() {
+                nodeComplete(node, node.getResult());
+                done();
+              },
+              queueableFns: wrapChildren(node, segmentNumber),
+              userContext: node.sharedUserContext(),
+              onException: function() {
+                node.onException.apply(node, arguments);
+              }
+            });
+          }
+        };
+      } else {
+        return {
+          fn: function(done) { node.execute(done, stats[node.id].executable); }
+        };
+      }
+    }
+
+    function wrapChildren(node, segmentNumber) {
+      var result = [],
+        segmentChildren = stats[node.id].segments[segmentNumber].nodes;
+
+      for (var i = 0; i < segmentChildren.length; i++) {
+        result.push(executeNode(segmentChildren[i].owner, segmentChildren[i].index));
+      }
+
+      if (!stats[node.id].executable) {
+        return result;
+      }
+
+      return node.beforeAllFns.concat(result).concat(node.afterAllFns);
+    }
+  }
+
+  return TreeProcessor;
+};
+
+getJasmineRequireObj().Any = function(j$) {
+
+  function Any(expectedObject) {
+    if (typeof expectedObject === 'undefined') {
+      throw new TypeError(
+        'jasmine.any() expects to be passed a constructor function. ' +
+        'Please pass one or use jasmine.anything() to match any object.'
+      );
+    }
+    this.expectedObject = expectedObject;
+  }
+
+  Any.prototype.asymmetricMatch = function(other) {
+    if (this.expectedObject == String) {
+      return typeof other == 'string' || other instanceof String;
+    }
+
+    if (this.expectedObject == Number) {
+      return typeof other == 'number' || other instanceof Number;
+    }
+
+    if (this.expectedObject == Function) {
+      return typeof other == 'function' || other instanceof Function;
+    }
+
+    if (this.expectedObject == Object) {
+      return typeof other == 'object';
+    }
+
+    if (this.expectedObject == Boolean) {
+      return typeof other == 'boolean';
+    }
+
+    return other instanceof this.expectedObject;
+  };
+
+  Any.prototype.jasmineToString = function() {
+    return '<jasmine.any(' + j$.fnNameFor(this.expectedObject) + ')>';
+  };
+
+  return Any;
+};
+
+getJasmineRequireObj().Anything = function(j$) {
+
+  function Anything() {}
+
+  Anything.prototype.asymmetricMatch = function(other) {
+    return !j$.util.isUndefined(other) && other !== null;
+  };
+
+  Anything.prototype.jasmineToString = function() {
+    return '<jasmine.anything>';
+  };
+
+  return Anything;
+};
+
+getJasmineRequireObj().ArrayContaining = function(j$) {
+  function ArrayContaining(sample) {
+    this.sample = sample;
+  }
+
+  ArrayContaining.prototype.asymmetricMatch = function(other) {
+    var className = Object.prototype.toString.call(this.sample);
+    if (className !== '[object Array]') { throw new Error('You must provide an array to arrayContaining, not \'' + this.sample + '\'.'); }
+
+    for (var i = 0; i < this.sample.length; i++) {
+      var item = this.sample[i];
+      if (!j$.matchersUtil.contains(other, item)) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+
+  ArrayContaining.prototype.jasmineToString = function () {
+    return '<jasmine.arrayContaining(' + jasmine.pp(this.sample) +')>';
+  };
+
+  return ArrayContaining;
+};
+
+getJasmineRequireObj().ObjectContaining = function(j$) {
+
+  function ObjectContaining(sample) {
+    this.sample = sample;
+  }
+
+  function getPrototype(obj) {
+    if (Object.getPrototypeOf) {
+      return Object.getPrototypeOf(obj);
+    }
+
+    if (obj.constructor.prototype == obj) {
+      return null;
+    }
+
+    return obj.constructor.prototype;
+  }
+
+  function hasProperty(obj, property) {
+    if (!obj) {
+      return false;
+    }
+
+    if (Object.prototype.hasOwnProperty.call(obj, property)) {
+      return true;
+    }
+
+    return hasProperty(getPrototype(obj), property);
+  }
+
+  ObjectContaining.prototype.asymmetricMatch = function(other) {
+    if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
+
+    for (var property in this.sample) {
+      if (!hasProperty(other, property) ||
+        !j$.matchersUtil.equals(this.sample[property], other[property])) {
+        return false;
+      }
+    }
+
+    return true;
+  };
+
+  ObjectContaining.prototype.jasmineToString = function() {
+    return '<jasmine.objectContaining(' + j$.pp(this.sample) + ')>';
+  };
+
+  return ObjectContaining;
+};
+
+getJasmineRequireObj().StringMatching = function(j$) {
+
+  function StringMatching(expected) {
+    if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) {
+      throw new Error('Expected is not a String or a RegExp');
+    }
+
+    this.regexp = new RegExp(expected);
+  }
+
+  StringMatching.prototype.asymmetricMatch = function(other) {
+    return this.regexp.test(other);
+  };
+
+  StringMatching.prototype.jasmineToString = function() {
+    return '<jasmine.stringMatching(' + this.regexp + ')>';
+  };
+
+  return StringMatching;
+};
+
+getJasmineRequireObj().errors = function() {
+  function ExpectationFailed() {}
+
+  ExpectationFailed.prototype = new Error();
+  ExpectationFailed.prototype.constructor = ExpectationFailed;
+
+  return {
+    ExpectationFailed: ExpectationFailed
+  };
+};
 getJasmineRequireObj().matchersUtil = function(j$) {
   // TODO: what to do about jasmine.pp not being inject? move to JSON.stringify? gut PrettyPrinter?
 
@@ -1748,7 +2682,9 @@ getJasmineRequireObj().matchersUtil = function(j$) {
     contains: function(haystack, needle, customTesters) {
       customTesters = customTesters || [];
 
-      if (Object.prototype.toString.apply(haystack) === "[object Array]") {
+      if ((Object.prototype.toString.apply(haystack) === '[object Array]') ||
+        (!!haystack && !haystack.indexOf))
+      {
         for (var i = 0; i < haystack.length; i++) {
           if (eq(haystack[i], needle, [], [], customTesters)) {
             return true;
@@ -1756,7 +2692,8 @@ getJasmineRequireObj().matchersUtil = function(j$) {
         }
         return false;
       }
-      return haystack.indexOf(needle) >= 0;
+
+      return !!haystack && haystack.indexOf(needle) >= 0;
     },
 
     buildFailureMessage: function() {
@@ -1767,29 +2704,55 @@ getJasmineRequireObj().matchersUtil = function(j$) {
         expected = args.slice(3),
         englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
 
-      var message = "Expected " +
+      var message = 'Expected ' +
         j$.pp(actual) +
-        (isNot ? " not " : " ") +
+        (isNot ? ' not ' : ' ') +
         englishyPredicate;
 
       if (expected.length > 0) {
         for (var i = 0; i < expected.length; i++) {
           if (i > 0) {
-            message += ",";
+            message += ',';
           }
-          message += " " + j$.pp(expected[i]);
+          message += ' ' + j$.pp(expected[i]);
         }
       }
 
-      return message + ".";
+      return message + '.';
     }
   };
 
+  function isAsymmetric(obj) {
+    return obj && j$.isA_('Function', obj.asymmetricMatch);
+  }
+
+  function asymmetricMatch(a, b) {
+    var asymmetricA = isAsymmetric(a),
+      asymmetricB = isAsymmetric(b);
+
+    if (asymmetricA && asymmetricB) {
+      return undefined;
+    }
+
+    if (asymmetricA) {
+      return a.asymmetricMatch(b);
+    }
+
+    if (asymmetricB) {
+      return b.asymmetricMatch(a);
+    }
+  }
+
   // Equality function lovingly adapted from isEqual in
   //   [Underscore](http://underscorejs.org)
   function eq(a, b, aStack, bStack, customTesters) {
     var result = true;
 
+    var asymmetricResult = asymmetricMatch(a, b);
+    if (!j$.util.isUndefined(asymmetricResult)) {
+      return asymmetricResult;
+    }
+
     for (var i = 0; i < customTesters.length; i++) {
       var customTesterResult = customTesters[i](a, b);
       if (!j$.util.isUndefined(customTesterResult)) {
@@ -1797,27 +2760,6 @@ getJasmineRequireObj().matchersUtil = function(j$) {
       }
     }
 
-    if (a instanceof j$.Any) {
-      result = a.jasmineMatches(b);
-      if (result) {
-        return true;
-      }
-    }
-
-    if (b instanceof j$.Any) {
-      result = b.jasmineMatches(a);
-      if (result) {
-        return true;
-      }
-    }
-
-    if (b instanceof j$.ObjectContaining) {
-      result = b.jasmineMatches(a);
-      if (result) {
-        return true;
-      }
-    }
-
     if (a instanceof Error && b instanceof Error) {
       return a.message == b.message;
     }
@@ -1853,6 +2795,29 @@ getJasmineRequireObj().matchersUtil = function(j$) {
           a.ignoreCase == b.ignoreCase;
     }
     if (typeof a != 'object' || typeof b != 'object') { return false; }
+
+    var aIsDomNode = j$.isDomNode(a);
+    var bIsDomNode = j$.isDomNode(b);
+    if (aIsDomNode && bIsDomNode) {
+      // At first try to use DOM3 method isEqualNode
+      if (a.isEqualNode) {
+        return a.isEqualNode(b);
+      }
+      // IE8 doesn't support isEqualNode, try to use outerHTML && innerText
+      var aIsElement = a instanceof Element;
+      var bIsElement = b instanceof Element;
+      if (aIsElement && bIsElement) {
+        return a.outerHTML == b.outerHTML;
+      }
+      if (aIsElement || bIsElement) {
+        return false;
+      }
+      return a.innerText == b.innerText && a.textContent == b.textContent;
+    }
+    if (aIsDomNode || bIsDomNode) {
+      return false;
+    }
+
     // Assume equality for cyclic structures. The algorithm for detecting cyclic
     // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
     var length = aStack.length;
@@ -1866,23 +2831,20 @@ getJasmineRequireObj().matchersUtil = function(j$) {
     bStack.push(b);
     var size = 0;
     // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack, customTesters))) { break; }
-        }
-      }
-    } else {
+    // Compare array lengths to determine if a deep comparison is necessary.
+    if (className == '[object Array]' && a.length !== b.length) {
+      result = false;
+    }
+
+    if (result) {
       // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(isFunction(aCtor) && (aCtor instanceof aCtor) &&
-        isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
+      // or `Array`s from different frames are.
+      if (className !== '[object Array]') {
+        var aCtor = a.constructor, bCtor = b.constructor;
+        if (aCtor !== bCtor && !(isFunction(aCtor) && aCtor instanceof aCtor &&
+          isFunction(bCtor) && bCtor instanceof bCtor)) {
+          return false;
+        }
       }
       // Deep compare objects.
       for (var key in a) {
@@ -1908,7 +2870,7 @@ getJasmineRequireObj().matchersUtil = function(j$) {
     return result;
 
     function has(obj, key) {
-      return obj.hasOwnProperty(key);
+      return Object.prototype.hasOwnProperty.call(obj, key);
     }
 
     function isFunction(obj) {
@@ -2018,9 +2980,9 @@ getJasmineRequireObj().toBeNaN = function(j$) {
         };
 
         if (result.pass) {
-          result.message = "Expected actual not to be NaN.";
+          result.message = 'Expected actual not to be NaN.';
         } else {
-          result.message = "Expected " + j$.pp(actual) + " to be NaN.";
+          result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; };
         }
 
         return result;
@@ -2132,8 +3094,8 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) {
         result.pass = actual.calls.any();
 
         result.message = result.pass ?
-          "Expected spy " + actual.and.identity() + " not to have been called." :
-          "Expected spy " + actual.and.identity() + " to have been called.";
+        'Expected spy ' + actual.and.identity() + ' not to have been called.' :
+        'Expected spy ' + actual.and.identity() + ' to have been called.';
 
         return result;
       }
@@ -2143,9 +3105,40 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) {
   return toHaveBeenCalled;
 };
 
+getJasmineRequireObj().toHaveBeenCalledTimes = function(j$) {
+
+  function toHaveBeenCalledTimes() {
+    return {
+      compare: function(actual, expected) {
+        if (!j$.isSpy(actual)) {
+          throw new Error('Expected a spy, but got ' + j$.pp(actual) + '.');
+        }
+
+        var args = Array.prototype.slice.call(arguments, 0),
+          result = { pass: false };
+
+        if(!expected){
+          throw new Error('Expected times failed is required as an argument.');
+        }
+
+        actual = args[0];
+        var calls = actual.calls.count();
+        var timesMessage = expected === 1 ? 'once' : expected + ' times';
+        result.pass = calls === expected;
+        result.message = result.pass ?
+        'Expected spy ' + actual.and.identity() + ' not to have been called ' + timesMessage + '. It was called ' +  calls + ' times.' :
+        'Expected spy ' + actual.and.identity() + ' to have been called ' + timesMessage + '. It was called ' +  calls + ' times.';
+        return result;
+      }
+    };
+  }
+
+  return toHaveBeenCalledTimes;
+};
+
 getJasmineRequireObj().toHaveBeenCalledWith = function(j$) {
 
-  function toHaveBeenCalledWith(util) {
+  function toHaveBeenCalledWith(util, customEqualityTesters) {
     return {
       compare: function() {
         var args = Array.prototype.slice.call(arguments, 0),
@@ -2158,15 +3151,15 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) {
         }
 
         if (!actual.calls.any()) {
-          result.message = "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but it was never called.";
+          result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; };
           return result;
         }
 
-        if (util.contains(actual.calls.allArgs(), expectedArgs)) {
+        if (util.contains(actual.calls.allArgs(), expectedArgs, customEqualityTesters)) {
           result.pass = true;
-          result.message = "Expected spy " + actual.and.identity() + " not to have been called with " + j$.pp(expectedArgs) + " but it was.";
+          result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; };
         } else {
-          result.message = "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but actual calls were " + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + ".";
+          result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; };
         }
 
         return result;
@@ -2177,11 +3170,15 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) {
   return toHaveBeenCalledWith;
 };
 
-getJasmineRequireObj().toMatch = function() {
+getJasmineRequireObj().toMatch = function(j$) {
 
   function toMatch() {
     return {
       compare: function(actual, expected) {
+        if (!j$.isString_(expected) && !j$.isA_('RegExp', expected)) {
+          throw new Error('Expected is not a String or a RegExp');
+        }
+
         var regexp = new RegExp(expected);
 
         return {
@@ -2203,8 +3200,8 @@ getJasmineRequireObj().toThrow = function(j$) {
           threw = false,
           thrown;
 
-        if (typeof actual != "function") {
-          throw new Error("Actual is not a Function");
+        if (typeof actual != 'function') {
+          throw new Error('Actual is not a Function');
         }
 
         try {
@@ -2215,22 +3212,22 @@ getJasmineRequireObj().toThrow = function(j$) {
         }
 
         if (!threw) {
-          result.message = "Expected function to throw an exception.";
+          result.message = 'Expected function to throw an exception.';
           return result;
         }
 
         if (arguments.length == 1) {
           result.pass = true;
-          result.message = "Expected function not to throw, but it threw " + j$.pp(thrown) + ".";
+          result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; };
 
           return result;
         }
 
         if (util.equals(thrown, expected)) {
           result.pass = true;
-          result.message = "Expected function not to throw " + j$.pp(expected) + ".";
+          result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; };
         } else {
-          result.message = "Expected function to throw " + j$.pp(expected) + ", but it threw " +  j$.pp(thrown) + ".";
+          result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' +  j$.pp(thrown) + '.'; };
         }
 
         return result;
@@ -2242,22 +3239,19 @@ getJasmineRequireObj().toThrow = function(j$) {
 };
 
 getJasmineRequireObj().toThrowError = function(j$) {
-  function toThrowError (util) {
+  function toThrowError () {
     return {
       compare: function(actual) {
         var threw = false,
-          thrown,
-          errorType,
-          message,
-          regexp,
-          name,
-          constructorName;
+          pass = {pass: true},
+          fail = {pass: false},
+          thrown;
 
-        if (typeof actual != "function") {
-          throw new Error("Actual is not a Function");
+        if (typeof actual != 'function') {
+          throw new Error('Actual is not a Function');
         }
 
-        extractExpectedParams.apply(null, arguments);
+        var errorMatcher = getMatcher.apply(null, arguments);
 
         try {
           actual();
@@ -2267,136 +3261,198 @@ getJasmineRequireObj().toThrowError = function(j$) {
         }
 
         if (!threw) {
-          return fail("Expected function to throw an Error.");
+          fail.message = 'Expected function to throw an Error.';
+          return fail;
         }
 
         if (!(thrown instanceof Error)) {
-          return fail("Expected function to throw an Error, but it threw " + thrown + ".");
+          fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; };
+          return fail;
         }
 
-        if (arguments.length == 1) {
-          return pass("Expected function not to throw an Error, but it threw " + fnNameFor(thrown) + ".");
+        if (errorMatcher.hasNoSpecifics()) {
+          pass.message = 'Expected function not to throw an Error, but it threw ' + j$.fnNameFor(thrown) + '.';
+          return pass;
         }
 
-        if (errorType) {
-          name = fnNameFor(errorType);
-          constructorName = fnNameFor(thrown.constructor);
-        }
-
-        if (errorType && message) {
-          if (thrown.constructor == errorType && util.equals(thrown.message, message)) {
-            return pass("Expected function not to throw " + name + " with message \"" + message + "\".");
-          } else {
-            return fail("Expected function to throw " + name + " with message \"" + message +
-                        "\", but it threw " + constructorName + " with message \"" + thrown.message + "\".");
-          }
-        }
-
-        if (errorType && regexp) {
-          if (thrown.constructor == errorType && regexp.test(thrown.message)) {
-            return pass("Expected function not to throw " + name + " with message matching " + regexp + ".");
-          } else {
-            return fail("Expected function to throw " + name + " with message matching " + regexp +
-                        ", but it threw " + constructorName + " with message \"" + thrown.message + "\".");
-          }
-        }
-
-        if (errorType) {
-          if (thrown.constructor == errorType) {
-            return pass("Expected function not to throw " + name + ".");
-          } else {
-            return fail("Expected function to throw " + name + ", but it threw " + constructorName + ".");
-          }
-        }
-
-        if (message) {
-          if (thrown.message == message) {
-            return pass("Expected function not to throw an exception with message " + j$.pp(message) + ".");
-          } else {
-            return fail("Expected function to throw an exception with message " + j$.pp(message) +
-                        ", but it threw an exception with message " + j$.pp(thrown.message) + ".");
-          }
-        }
-
-        if (regexp) {
-          if (regexp.test(thrown.message)) {
-            return pass("Expected function not to throw an exception with a message matching " + j$.pp(regexp) + ".");
-          } else {
-            return fail("Expected function to throw an exception with a message matching " + j$.pp(regexp) +
-                        ", but it threw an exception with message " + j$.pp(thrown.message) + ".");
-          }
-        }
-
-        function fnNameFor(func) {
-            return func.name || func.toString().match(/^\s*function\s*(\w*)\s*\(/)[1];
-        }
-
-        function pass(notMessage) {
-          return {
-            pass: true,
-            message: notMessage
+        if (errorMatcher.matches(thrown)) {
+          pass.message = function() {
+            return 'Expected function not to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() + '.';
           };
-        }
-
-        function fail(message) {
-          return {
-            pass: false,
-            message: message
+          return pass;
+        } else {
+          fail.message = function() {
+            return 'Expected function to throw ' + errorMatcher.errorTypeDescription + errorMatcher.messageDescription() +
+              ', but it threw ' + errorMatcher.thrownDescription(thrown) + '.';
           };
-        }
-
-        function extractExpectedParams() {
-          if (arguments.length == 1) {
-            return;
-          }
-
-          if (arguments.length == 2) {
-            var expected = arguments[1];
-
-            if (expected instanceof RegExp) {
-              regexp = expected;
-            } else if (typeof expected == "string") {
-              message = expected;
-            } else if (checkForAnErrorType(expected)) {
-              errorType = expected;
-            }
-
-            if (!(errorType || message || regexp)) {
-              throw new Error("Expected is not an Error, string, or RegExp.");
-            }
-          } else {
-            if (checkForAnErrorType(arguments[1])) {
-              errorType = arguments[1];
-            } else {
-              throw new Error("Expected error type is not an Error.");
-            }
-
-            if (arguments[2] instanceof RegExp) {
-              regexp = arguments[2];
-            } else if (typeof arguments[2] == "string") {
-              message = arguments[2];
-            } else {
-              throw new Error("Expected error message is not a string or RegExp.");
-            }
-          }
-        }
-
-        function checkForAnErrorType(type) {
-          if (typeof type !== "function") {
-            return false;
-          }
-
-          var Surrogate = function() {};
-          Surrogate.prototype = type.prototype;
-          return (new Surrogate()) instanceof Error;
+          return fail;
         }
       }
     };
+
+    function getMatcher() {
+      var expected = null,
+        errorType = null;
+
+      if (arguments.length == 2) {
+        expected = arguments[1];
+        if (isAnErrorType(expected)) {
+          errorType = expected;
+          expected = null;
+        }
+      } else if (arguments.length > 2) {
+        errorType = arguments[1];
+        expected = arguments[2];
+        if (!isAnErrorType(errorType)) {
+          throw new Error('Expected error type is not an Error.');
+        }
+      }
+
+      if (expected && !isStringOrRegExp(expected)) {
+        if (errorType) {
+          throw new Error('Expected error message is not a string or RegExp.');
+        } else {
+          throw new Error('Expected is not an Error, string, or RegExp.');
+        }
+      }
+
+      function messageMatch(message) {
+        if (typeof expected == 'string') {
+          return expected == message;
+        } else {
+          return expected.test(message);
+        }
+      }
+
+      return {
+        errorTypeDescription: errorType ? j$.fnNameFor(errorType) : 'an exception',
+        thrownDescription: function(thrown) {
+          var thrownName = errorType ? j$.fnNameFor(thrown.constructor) : 'an exception',
+            thrownMessage = '';
+
+          if (expected) {
+            thrownMessage = ' with message ' + j$.pp(thrown.message);
+          }
+
+          return thrownName + thrownMessage;
+        },
+        messageDescription: function() {
+          if (expected === null) {
+            return '';
+          } else if (expected instanceof RegExp) {
+            return ' with a message matching ' + j$.pp(expected);
+          } else {
+            return ' with message ' + j$.pp(expected);
+          }
+        },
+        hasNoSpecifics: function() {
+          return expected === null && errorType === null;
+        },
+        matches: function(error) {
+          return (errorType === null || error instanceof errorType) &&
+            (expected === null || messageMatch(error.message));
+        }
+      };
+    }
+
+    function isStringOrRegExp(potential) {
+      return potential instanceof RegExp || (typeof potential == 'string');
+    }
+
+    function isAnErrorType(type) {
+      if (typeof type !== 'function') {
+        return false;
+      }
+
+      var Surrogate = function() {};
+      Surrogate.prototype = type.prototype;
+      return (new Surrogate()) instanceof Error;
+    }
   }
 
   return toThrowError;
 };
 
-getJasmineRequireObj().version = function() {
-  return "2.0.0";
+getJasmineRequireObj().interface = function(jasmine, env) {
+  var jasmineInterface = {
+    describe: function(description, specDefinitions) {
+      return env.describe(description, specDefinitions);
+    },
+
+    xdescribe: function(description, specDefinitions) {
+      return env.xdescribe(description, specDefinitions);
+    },
+
+    fdescribe: function(description, specDefinitions) {
+      return env.fdescribe(description, specDefinitions);
+    },
+
+    it: function() {
+      return env.it.apply(env, arguments);
+    },
+
+    xit: function() {
+      return env.xit.apply(env, arguments);
+    },
+
+    fit: function() {
+      return env.fit.apply(env, arguments);
+    },
+
+    beforeEach: function() {
+      return env.beforeEach.apply(env, arguments);
+    },
+
+    afterEach: function() {
+      return env.afterEach.apply(env, arguments);
+    },
+
+    beforeAll: function() {
+      return env.beforeAll.apply(env, arguments);
+    },
+
+    afterAll: function() {
+      return env.afterAll.apply(env, arguments);
+    },
+
+    expect: function(actual) {
+      return env.expect(actual);
+    },
+
+    pending: function() {
+      return env.pending.apply(env, arguments);
+    },
+
+    fail: function() {
+      return env.fail.apply(env, arguments);
+    },
+
+    spyOn: function(obj, methodName) {
+      return env.spyOn(obj, methodName);
+    },
+
+    jsApiReporter: new jasmine.JsApiReporter({
+      timer: new jasmine.Timer()
+    }),
+
+    jasmine: jasmine
+  };
+
+  jasmine.addCustomEqualityTester = function(tester) {
+    env.addCustomEqualityTester(tester);
+  };
+
+  jasmine.addMatchers = function(matchers) {
+    return env.addMatchers(matchers);
+  };
+
+  jasmine.clock = function() {
+    return env.clock;
+  };
+
+  return jasmineInterface;
 };
+
+getJasmineRequireObj().version = function() {
+  return '2.4.1';
+};
\ No newline at end of file