fixes for AndroidStudio
removing old files
fixes for eclipse
Merge pull request #4 from gguuss/master

Updates for Android Studio and changes to GMS