Adjusted proguard-rules to allow Google Play Services
Changed .gitignore to ignore the .idea/ folder and the xml file with API keys
Resolved merge conflicts: updated to new .gitignore!