File Revision
Merge branch 'FileRevision' of git://github.com/urg/seahub into urg-FileRevision

Conflicts:
	seahub/api2/urls.py
	seahub/api2/views.py