test add in phpStorm
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	source/back-end/views/site/index.php
test add in phpStorm