Merge origin/1.0

Conflicts:
	assets/mine/css/content.css
	assets/mine/css/global.css