Scott Erickson e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader ... Conflicts: app/views/kinds/CocoView.coffee app/views/play/level/level_loading_view.coffee		2014-04-11 11:19:16 -07:00
..
article	Added read only notification in editors. Fixed #374.	2014-04-01 13:15:30 -07:00
component	Added a versions modal for every type	2014-03-10 23:29:34 +01:00
components	Fixed last piece of #673.	2014-04-01 10:51:03 -07:00
level	Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader	2014-04-11 11:19:16 -07:00
thang	Make resources as static class to avoid loading multiple times.	2014-04-10 16:59:08 -04:00