Android folder fixes
Android location fixes
Location Fixes
Logout as action key
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
ValidorTest
Merge remote-tracking branch 'origin/master'