fixed merge conflicts. would be great if @milus16 could take a look.
Merged in Josh's web changes and fixed tons of merge conflicts from android stuff
Updated pathing to be to appspot domain in apiconnector and phone frame.