resume form added
Merge branch 'master' of https://github.com/realdah/hr_wechat_app.git

Conflicts:
	src/main/webapp/app/scripts/app.js