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

Conflicts:
	app/controllers/shared.php
suaib