partner in main page
Merge branch 'develop' of https://github.com/shidh/CSSA into develop
fix bug :list
Merge branch 'lxj' into develop
pagination ui
fix ViewEvent bug
Merge branch 'develop' of https://github.com/shidh/CSSA into develop
paging of news and events
rm paginate
fix map js problem
change index login form
improve myProfil
little stuff
birthday picker
fix bugs after adding birthday date picker
backend pagination
contacts html
change user model
del allen, huang, jeff for importing
Merge branch 'develop' of https://github.com/shidh/CSSA into develop

Conflicts:
	app/models/User.java
	conf/initial-data.yml