Dont fix indentation as we use tabs
Fix scrutinizer config file
Merge branch 'master' into develop