Removin some TODOS, doc and some small refactor
REfactor to use if elseif instead of switch clause
Improved messages and changed copyright
Removing tabs and white lines
Merge pull request #43 from Zentyal/jjgarcia/remove-TODOs

Remove TODOs