Remove trailing whitespaces
Merge branch 'development' of https://github.com/atrinik/atrinik into development