Merge pull request #55 from alfeko/master

updated with master
Update

integrated the usercontrols for create company and edit company

put in a little icon for testing purposes, and future config panel

Hooked up the status bar

did some minor refactoring of the companyController to remove the
handling of saving in the GUI layer

other minor tweaks and bugfixes
Update 1.1

More files to be commited appearantly
Fixed merge bugs