assets
Merge remote-tracking branch 'origin/master'

Conflicts:
	.htaccess
	composer.lock
	config/application.config.php
	init_autoloader.php
	module/Application/view/layout/layout.phtml
	module/Users/config/module.config.php
Merge remote-tracking branch 'origin/master'
MHRUserAdmin