Merge remote-tracking branch 'refs/remotes/origin/master' into SenneMMSystems
Deleted <<<<<<<<HEAD
Removed login button used old login page instead.
Pages edited:
-Settings.xaml.cs
-LoginUserControl.xaml.cs
-LoginUserControl.xaml
Removed login button used old login page instead.
Pages edited:
-Settings.xaml.cs
-LoginUserControl.xaml.cs
-LoginUserControl.xaml
Merge pull request #12 from brentproost/SenneMMSystems

Removed login button used old login page instead