added geolocation plugin
rebuilt android platform again
workspace file
merge require
that d*md'd workspace file!
trying to add .idea dir to gitignore
messing up merges
require merge?
plugins not working after sync
Merge branch 'master' into require
working require