base href
stub sittings page
remove trailing whitespaces
site name
more stub
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.ls
	app/app/controllers.ls
	app/index.static.jade
update deploy