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