Don't Use Me
Revert 4621fd5..6134a0d

This rolls back to commit 4621fd532262999edb08166a0329becfa2354d28.
Merge branch 'master' into MoreyBranch2
Merge branch 'master' into MoreyBranch2
Fixed Profile State button Display
Merge branch 'MoreyBranch2'
Merge remote-tracking branch 'origin/master' into JohnDev-Branch