Pulling for deployement
Fixed android manifest conflict
Merge branch 'master' of https://github.com/cropyield/cropyield
Merge branch 'master' of https://github.com/cropyield/cropyield
Fixed nested merge conflicts, git has the dumb