gallery apparently done
some changes
Merge branch 'master' of heroku.com:iseteam

Conflicts:
	iseteam/settings.pyc