Merge pull request #886 from bantic/update-ember-1.5.0

Update to Ember 1.5.0, updates ember-data also

architecture-examples/emberjs/bower.json

@@ -5,8 +5,8 @@
     "todomvc-common": "~0.1.4",
     "jquery": "~2.1.0",
     "handlebars": "~1.3.0",
-    "ember": "~1.3.1",
-    "ember-data": "1.0.0-beta.6",
+    "ember": "~1.5.0",
+    "ember-data": "1.0.0-beta.7",
     "ember-localstorage-adapter": "latest"
   }
 }

architecture-examples/emberjs/index.html

@@ -57,11 +57,15 @@
 					<a href="http://github.com/tomdale">Tom Dale</a>,
 					<a href="http://github.com/addyosmani">Addy Osmani</a>
 				</p>
+				<p>
+					Updated by
+					<a href="http://github.com/bantic">Cory Forsyth</a>
+				</p>
 				<p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
 			</footer>
 		</script>
 		<script src="bower_components/todomvc-common/base.js"></script>
-		<script src="bower_components/jquery/jquery.js"></script>
+		<script src="bower_components/jquery/dist/jquery.js"></script>
 		<script src="bower_components/handlebars/handlebars.js"></script>
 		<script src="bower_components/ember/ember.js"></script>
 		<script src="bower_components/ember-data/ember-data.js"></script>

architecture-examples/emberjs/js/helpers/pluralize.js

-/*global Todos, Ember */
+/*global Ember */
 (function () {
 	'use strict';
 
 	Ember.Handlebars.helper('pluralize', function (singular, count) {
 		/* From Ember-Data */
-		var inflector = new Ember.Inflector(Ember.Inflector.defaultRules);
+		var inflector = Ember.Inflector.inflector;
 
 		return count === 1 ? singular : inflector.pluralize(singular);
 	});