Merge pull request #224 from fsr-itse/develop

Merge develop into master
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
fixed bug where delegate didn't see courses when id and userprofile.id from represented user were different
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
merge develop
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop'
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'develop' of https://github.com/fsr-itse/EvaP
Merge branch 'master' of https://github.com/fsr-itse/EvaP
Merge remote-tracking branch 'origin/master' into develop
convert windows to unix line endings, ref #274
tabs to spaces, ref #274

I left out evap/static/.
add newlines at end of file, ref #274
remove trailing whitespace, ref #274

i didn't touch the migrations, though
Merge branch 'whitespace_fixes' into develop
added Matthias Kohnen to contributors
added python 3.3 and 3.4 to travis allow failures