Changes Site name - Fixes #21
Changes Site Name
Merge remote-tracking branch 'origin/dev'

Conflicts:
	app/controllers/pages_controller.js
	app/views/pages/main.html.mustache
Merge remote-tracking branch 'origin/dev'