Fix pages.
Merge branch 'master' into 3

Conflicts:
	Gruntfile.js
	app/pages-list/index.html
	template/page.html