[Change] Application mode
Merge branch 'master' into beta

Conflicts:
	www/index.php
Merge branch 'master' into beta
[FIXING] JSONKIT not found
[DELETE] Some cleanup