restart
Merge branch 'develop'

Conflicts:
	gruntfile.js
	index.html
	jade/index.jade