commit of all the changes done while BA consulting
ignoring now eclipse settings
merge mit master