hmabuzar
abuzarMerge branch 'master' of https://github.com/missuperior/mysuperior

Conflicts:
	supapplication/controllers/admin.php
	supapplication/models/admin_model.php
reference module
Merge branch 'master' of https://github.com/missuperior/mysuperior

Conflicts:
	supapplication/controllers/admin.php
	supapplication/models/admin_model.php