Removed one line
Added dual mode system
Adding comment one line
Merge branch 'local_master' into BETA

Conflicts:
	index.php