Merge branch 'development'

Conflicts:
	index.php