testcommit
Merge branch 'master' of https://github.com/r4zor3/test

Conflicts:
	app/controllers/TestController.php
ttt