Changes due to upgrading studio to 0.6.1
Some previous work + first commit after opening the project in AS on OSX