Merge origin/master

Conflicts:
	SpringZoom/web/css/style.css
Merge origin/master