Merge branch 'zyl' of https://github.com/thiswind/lily into zyl

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
add photo icon of person
add photo icon of person
fix
完成了档案信息界面
替换了favicon.ico
联系信息，派遣信息，就业信息界面
完成了档案信息界面
完成了基本信息界面
完成了户籍信息界面
把 list 的search 提取到了 全局的Lily 里面
fix
add progress bar
Merge branch 'mila1'

added change validate
Merge remote-tracking branch 'origin/nj2'

Conflicts:
	app/views/student/base_info.html
Merge remote-tracking branch 'origin/zyl'
Merge remote-tracking branch 'origin/zyl1'

Conflicts:
	app/views/student/base_info.html
Merge branch 'hk122602'

Conflicts:
	app/scripts/controllers/student/profile_info.js
	app/views/student/profile_info.html