OK
Merge branch 'master' of https://github.com/coepoe/glapp
Merge branch 'master' of https://github.com/coepoe/glapp
Edit From Unix :))
Merge branch 'master' of https://github.com/coepoe/glapp

Conflicts:
	app/controllers/dv_txbrkeluar.php