Merge origin/master

Conflicts:
	styles/stylePlus.css
	view/addDesignPattern.php
	view/previewAddDP.php
Merge origin/master
Merge origin/master

Conflicts:
	styles/stylePlus.css
	view/addDesignPattern.php
	view/previewAddDP.php
Merge origin/master