Mass reformatting of conflicting files
Fixed servicebar to work with new namespace
Fixed code style error
Merge pull request #22 from GUI2BCD/Reformatting

Reformatting