home 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/itemneareststation.js
	public/templates/resume/default/itemavailabledate.html
	public/templates/resume/default/itembirthday.html
	public/templates/resume/default/itemcareer.html
	public/templates/resume/default/itemeducation.html
	public/templates/resume/default/itemfirstarrive.html
	public/templates/resume/default/itemqualification.html
	public/templates/resume/default/itemworkexperience.html
	public/templates/resume/style1/itemavailabledate.html
	public/templates/resume/style1/itembirthday.html
	public/templates/resume/style1/itemcareer.html
	public/templates/resume/style1/itemeducation.html
	public/templates/resume/style1/itemfirstarrive.html
	public/templates/resume/style1/itemqualification.html
	public/templates/resume/style1/itemworkexperience.html
	public/templates/resume/style2/itemavailabledate.html
	public/templates/resume/style2/itembirthday.html
	public/templates/resume/style2/itemcareer.html
	public/templates/resume/style2/itemeducation.html
	public/templates/resume/style2/itemfirstarrive.html
	public/templates/resume/style2/itemqualification.html
	public/templates/resume/style2/itemworkexperience.html
	public/templates/resume/style3/itemavailabledate.html
	public/templates/resume/style3/itembirthday.html
	public/templates/resume/style3/itemcareer.html
	public/templates/resume/style3/itemeducation.html
	public/templates/resume/style3/itemfirstarrive.html
	public/templates/resume/style3/itemqualification.html
	public/templates/resume/style3/itemworkexperience.html
	public/templates/resume/style4/compositecareer.html
	public/templates/resume/style4/compositeeducation.html
	public/templates/resume/style4/compositequalification.html
	public/templates/resume/style4/compositeworkexperience.html
	public/templates/resume/style4/itemaddress.html
	public/templates/resume/style4/itemavailabledate.html
	public/templates/resume/style4/itembirthday.html
	public/templates/resume/style4/itemcareer.html
	public/templates/resume/style4/itemeducation.html
	public/templates/resume/style4/itememail.html
	public/templates/resume/style4/itemgender.html
	public/templates/resume/style4/itemhomepage.html
	public/templates/resume/style4/itemlanguage.html
	public/templates/resume/style4/itemmarried.html
	public/templates/resume/style4/itemname.html
	public/templates/resume/style4/itemnationality.html
	public/templates/resume/style4/itemphoto.html
	public/templates/resume/style4/itemqualification.html
	public/templates/resume/style4/itemselfintroduction.html
	public/templates/resume/style4/itemskill.html
	public/templates/resume/style4/itemtelno.html
	public/templates/resume/style4/itemworkexperience.html
	public/templates/resume/style5/itemavailabledate.html
	public/templates/resume/style5/itembirthday.html
	public/templates/resume/style5/itemcareer.html
	public/templates/resume/style5/itemeducation.html
	public/templates/resume/style5/itemfirstarrive.html
	public/templates/resume/style5/itemqualification.html
	public/templates/resume/style5/itemworkexperience.html
	public/templates/resume/style6/itemavailabledate.html
	public/templates/resume/style6/itembirthday.html
	public/templates/resume/style6/itemcareer.html
	public/templates/resume/style6/itemeducation.html
	public/templates/resume/style6/itemfirstarrive.html
	public/templates/resume/style6/itemqualification.html
	public/templates/resume/style6/itemworkexperience.html