Random stuff
Merge branch 'master' of https://github.com/TugaPower/member-cms

Conflicts:
	index.php
Merge branch 'master' of https://github.com/TugaPower/member-cms