update
Merge branch 'tutorials'
update
Merge branch 'tutorials'

Conflicts:
	preprocessors/tutorials/coffee/app.models.coffee
	tutorials/js/app.models.js
tutorials/coffee/app.models.coffee