update to work with android studio 0.5.1. add some instructions for setting up and running the project.
Merge remote-tracking branch 'org/master'