Merge branch 'gorlanwix-Feature-LoginVerification'

Fixing automatic merge problems
Fixing merge issues
Merge branch 'gorlanwix-Feature-LoginVerification'

Trying to fix merge problems
Merge remote-tracking branch 'upstream/master'

I have to type a message again...?
This is for merging the upstream with my local directory
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Merging authentication redirects to my directory.
Update the instance getter to get the unparsed instance.
Git merge-tool the changes
Merge pull request #63 from gorlanwix/Feature-UpdateInstanceGetter

Feature update instance getter
adds parsing instance
Merge remote-tracking branch 'upstream/master' into Feature-PolishingUp
Fix instance ID for demo
Change a line to redo the previous reset
Merge pull request #64 from gorlanwix/Fix-instanceId2

remove merge conflicts
Forgot to add location service as dependency
Redoing the changes so that it looks like what it did during the demo
Merge pull request #66 from gorlanwix/Fix-instanceId2

Fix instance id2
instance as a query param when auth url
Merge pull request #67 from andreywix/Feature-PolishingUp

Feature - Polishing Up
Fixed merge conflict