Merge branch 'master' of https://github.com/oboegrace/mgrstudio

Conflicts:
	.htaccess
	main/model/mainModel.php
	main/view/theme/default/template/footer.php
update footer
try to merge...
merge