Merge origin/master

Conflicts:
	Public/css/style.css
Merge origin/master