some changes
Merge branch 'master' of https://github.com/gridsquare/photosheet

Conflicts:
	app/config.php
	app/load.php
	app/templates/one/css/stylesheet.css