Moved location logic to start
Merge branch 'master' of https://github.com/Madrox/nshackathon
Debugging dropbox auth
Merge branch 'master' of https://github.com/Madrox/nshackathon