Merge origin/master

Conflicts:
	public/assets/js/frontend/main.js
	vendor/Controllers/Frontend/Index.php
Merge origin/master

Conflicts:
	public/assets/js/frontend/main.js
	vendor/Controllers/Frontend/Index.php
Merge origin/master

Conflicts:
	public/assets/js/frontend/main.js
	vendor/Controllers/Frontend/Index.php