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

Conflicts:
	app/controllers/gd_tt.php