Added one comments
Added somethings in beta branch
Some more things for BETA
Merge branch 'Beta' into website

Conflicts:
	index.php