test
[보람] 학력 템플릿 작성
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/app/js/controllers/informationManager.js
	res/app/partials/informationManager.html
[보람] 기본정보 템플릿 작성