BC-16
Merge branch 'BC-15' into dev

Conflicts:
	index.php
Merge branch 'BC-16' into dev

Conflicts:
	index.php
Merge branch 'master' into dev

Conflicts:
	index.php
BC-17