Merge branch 'master' into HEAD
[misc] Updated the code to work with the current master branch, applied codestyle, used proper logging initialization
[misc] Updated code to work with the latest phenotips snapshot
Merge branch 'master' into feature-mic
Merged master
Merge branch 'master' into feature-mic
Merge branch 'feature-mic' into buske-master
Merged in changes from upstream origin