[msg] added 'add file/directory'
[msg] show avatar of contact
[api] Add api for activity and group discussion
Finish apis for activity and discusion ajax
[api2] Bug fix for import auth
[api2] Add missed import
[api]Move api related tempaltes to api2/templates
[api2 activity/discussion] improved ui/interaction
fixed activity 'more' bug; finished getting 'more' discussions with ajax
[api2] Add apis for adding message and reply

Conflicts:

	seahub/api2/templates/api2/api2_group_discuss.html
	seahub/api2/templates/api2/group_msgs.html
[api] pass auth token to js in android

Conflicts:

	seahub/api2/templates/api2/api2_events_js.html
[api2] fixed bug in discussion.html
improve api_convert_desc_link
[api] improve the way of passing in the auth token on Android
[api2] cleaned up events & discussions
[api2] Init g_token
[api2] Fix global name not defined
[api2]Fix anme arg
[api] Fix a bug for group wih no discussions
[api2] events/discussion: improved 'loading' & fixed bug