fix 1
Merge branch 'develop' into dev2

Conflicts:
	index.php