[GAE Server] Merged changes made by Leo in pull request
Merge branch 'develop' of github.com:usersource/anno into feature/usb