fixed space/tabs mix and E11 ("indentation is not a multiple of 4")
Merge branch 'develop' into bugfix-E11
Merge pull request #1 from medularis/bugfix-E11

Fix indentation bugs