continue dev
V1.1
Merge branch 'dev'

Conflicts:
	index.php