Merge pull request #28 from pigmike/master

Fix bugs that the personal permission's page show fault
fix student submit paper error
meger jasli2 master branch
Merge pull request #29 from hutuxiansheng/master

fix student can not submit paper
Capistrano add
remove Capistrano
Merge branch 'master' of https://github.com/jasli2/evolution
update navibar
Merge branch 'master' of https://github.com/jasli2/evolution

Conflicts:
	app/assets/stylesheets/style.default.css.erb
	app/views/admin/admin/dashboard.html.erb
modify navibar
modify left menu background
show different badge style
add datepicker event background and day click event
Merge pull request #47 from cocosvsn/master

modify navibar and slide
Merge branch 'master' of https://github.com/jasli2/evolution
fix reply comments bug
Separate abstract comment class
fix dashbord chart and calender
add jquery chart lib
Merge pull request #48 from cocosvsn/master

today is tuesday
Remove some information in admin dashboard.
change something