develop commit
develop commit
Merge branch 'master' into en-version

Conflicts:
	less/style.less
	public/javascripts/views/resume/menubackground.js
	public/stylesheets/style.css