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
Simplified code for checking if app is active
Working on OverloadUI
fixes capacity
removes dummy variable
Merge pull request #60 from andreywix/Feature-PolishingUp

Feature: Polishing Up
Merge remote-tracking branch 'upstream/master'
renames capacity
redirects to verified on login
Merge pull request #61 from andreywix/Feature-PolishingUp

Feature: Polishing up
Merge remote-tracking branch 'upstream/master'

Merging authentication redirects to my directory.
More work on Overload UI
Merge pull request #62 from jeffreywix/Feature-OverloadHandling

Feature overload handling
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