Save
Merge branch 'master' of https://github.com/missuperior/mysuperior

Conflicts:
	supapplication/config/config.php
	supapplication/config/database.php
Merge branch 'master' of https://github.com/missuperior/mysuperior
save
Conflicts:
	supapplication/config/config.php