Added STS settings.
I hate windows, some crap settings again.
Merge branch 'develop'