Major revamp
Merge branch 'master' of https://github.com/Holmgr/GabJab

Conflicts:
	core/classes/general.php
	core/classes/users.php
	home.php
	login.php
	profile.php