Forcing locale to be a value in the built version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	todo-example/dojo/index.html
Moving across to new template
Fixing inline edit styling
Fixing showing and hiding of page elements on items selected
Final modifications to match new template.
Removing unneeded files and trimming CSS.
Final changes to merge dojo example with new template & spec
TodoMVC using new dojox/mvc 1.8 features.
Update labs/architecture-examples/sammyjs/css/app.css

now when checkbox done - style is working
Merge pull request #272 from nemilya/master

css fix
Update labs/architecture-examples/dijon/js/services/LocalStorageService.js

should use "ns" argument var rather than the global "dijondemo" var
Merge pull request #273 from dadaxr/patch-1

Update labs/architecture-examples/dijon/js/services/LocalStorageService....
Merge branch 'master' of https://github.com/addyosmani/todomvc

Conflicts:
	architecture-examples/dojo/css/app.css
	architecture-examples/dojo/index.html
	architecture-examples/dojo/js/lib/dojo/dojo.js
	architecture-examples/dojo/js/todo/app.js
	architecture-examples/dojo/js/todo/model/TodoModel.js
Merge remote-tracking branch 'workg/dojo18' into dojo18
Merge remote-tracking branch 'workg/dojo18' into dojo18-tests
Removed test files from dojo18 branch.
Add changes for #259, started in #260
Changing license to MIT.
Separate data binding definitions from templates.