Merge origin/master

Conflicts:
	styles/stylePlus.css