beta with min js and css
Merge branch 'dev'

Conflicts:
	index.php
Merge branch 'dev'

Conflicts:
	index.php
v2.0 ready