Added proguard-project file back as building with it requires it.
Moved .gitignore changes to mobile/.gitignore
Merge branch 'androidstudio' into multiwindow