pulling activities from web service
Merge branch 'webservice' into develop