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

Conflicts:
	public/javascripts/views/resume/itemfirstarrive.js
	public/javascripts/views/resume/itemitexperience.js
	public/javascripts/views/resume/itemname.js
	public/javascripts/views/resume/itemneareststation.js
	public/javascripts/views/resume/menuitem.js
	public/javascripts/views/resume/resume.js