1.0.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	javascript/mvc/controllers/home.js
	partial/home.html