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/itemneareststation.js
	public/templates/resume/default/itemcareer.html
	public/templates/resume/default/itemeducation.html
	public/templates/resume/default/itemworkexperience.html
	public/templates/resume/style1/itemcareer.html
	public/templates/resume/style1/itemeducation.html
	public/templates/resume/style1/itemworkexperience.html
	public/templates/resume/style2/itemcareer.html
	public/templates/resume/style2/itemeducation.html
	public/templates/resume/style2/itemqualification.html
	public/templates/resume/style2/itemworkexperience.html
	public/templates/resume/style3/itemaddress.html
	public/templates/resume/style3/itemcareer.html
	public/templates/resume/style3/itemeducation.html
	public/templates/resume/style3/itememail.html
	public/templates/resume/style3/itemhomepage.html
	public/templates/resume/style3/itemqualification.html
	public/templates/resume/style3/itemtelno.html
	public/templates/resume/style3/itemworkexperience.html
	public/templates/resume/style4/itemaddress.html
	public/templates/resume/style4/itemcareer.html
	public/templates/resume/style4/itemeducation.html
	public/templates/resume/style4/itememail.html
	public/templates/resume/style4/itemhomepage.html
	public/templates/resume/style4/itemqualification.html
	public/templates/resume/style4/itemtelno.html
	public/templates/resume/style4/itemworkexperience.html
	public/templates/resume/style5/itemcareer.html
	public/templates/resume/style5/itemeducation.html
	public/templates/resume/style5/itemworkexperience.html
	public/templates/resume/style6/itemaddress.html
	public/templates/resume/style6/itemcareer.html
	public/templates/resume/style6/itemeducation.html
	public/templates/resume/style6/itememail.html
	public/templates/resume/style6/itemhomepage.html
	public/templates/resume/style6/itemqualification.html
	public/templates/resume/style6/itemtelno.html
	public/templates/resume/style6/itemworkexperience.html