[UPDATED] misc updates
Merge branch 'master' of https://github.com/gudoy/PHPGasus-v0

Conflicts:
	config/appData.php