Commiting changes made since beta testers number 2. Made changes to web service and android