Import source code
Merge branch 'master' of heroku.com:gentle-taiga-8606

Conflicts:
	web/index.php