merge last week team changes 

1. a basic RESTful API
2.  fixes to upload