Merge branch 'BC-10' into dev
Merge branch 'BC-9' into dev
Merge branch 'BC-12' into dev
Merge branch 'BC-13' into dev
Merge branch 'master' into dev
BC-14
BC-15
Merge branch 'BC-14'

Conflicts:
	index.php