Merge branch 'master' of https://github.com/leemannd/ogo

Conflicts:
	app/public_html/js/main.js