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

Conflicts:
	app/controllers/gd_tt.php