changes
Merge branch 'master' of https://github.com/missuperior/tss

Conflicts:
	controller/adminController.php