Merge branch 'dev'

Conflicts:
	views/about.html
	views/main.html