Changed to new coding style

Changed the conflicting files to follow joint coding style.
Corrected two issues that I missed

Two style issues needed to be corrected.
Merge pull request #18 from GUI2BCD/NewFormatStyle

Changed to new coding style
Merge remote-tracking branch 'origin/master' into LoginBackend