add message module and two interface
some change in html
some change in html
update views
fix a bug in view
update views
Merge branch 'master' of git://github.com/dancewhale/seahub into dancewhale-master
Fixed small bugs in merging message
Added payment
Fixed api2 bugs
Merge branch 'feature/payment'
Merge branch 'dancewhale-master'

Conflicts:
	media/css/seahub.css
	seahub/templates/myhome.html
	seahub/templates/wiki/personal_wiki.html