Merge branch 'master' into develop
Fixed the untappd hammering bug
Working on adding oath support
Working on getting user logins working
Working on getting the urls working properly
Still working on getting oauth working
Got the login process working
Merge branch 'oauth' into develop
Last fix for man add
Merge branch 'manual_add'
Fixed the redirect ulr