h
Merge branch 'master' of github.com:coepoe/glapp

Conflicts:
	app/views/app_page.php