Removed gen files
Changed reference to google-play-services (note that google-play-services project should be on the same drive as the project)
Merge commit 'eee47264610d946b1301db084422247415aeed21'
Updated version number after google service bug