Squashed commit of the following:

commit de1495629efe75fe50bbb52eeca0392a68470813
Author: Bl00drav3n <bl00d_rav3n@gmx.net>
Date:   Thu Jul 10 20:12:41 2014 +0200

    fixed even more withespaces

commit 260a058eb041acee89f099abba8b99774a175392
Author: Bl00drav3n <bl00d_rav3n@gmx.net>
Date:   Thu Jul 10 20:07:11 2014 +0200

    fixed tabstops (replaced by spaces), corrected email

commit 6ec461f4868f36d57c6aabb19175710f9f9137ce
Author: Bl00drav3n <bl00d_rav3n@gmx.net>
Date:   Thu Jul 10 19:41:44 2014 +0200

    reverted some silly changes

commit 35a02a5e05c6e62fb76583f88e921e9d9cf90d5f
Author: Bl00drav3n <bl00d_rav3n@gmx.net>
Date:   Thu Jul 10 19:29:16 2014 +0200

    fixed repo files for pull request

commit 8350c7f5b22594962d9ec3eb3541e46274833c29
Author: Bl00drav3n <bl00d_rav3n@gmx.net>
Date:   Thu Jul 10 17:59:24 2014 +0200

    v1.2.6 - fixed scene switching
Merge branch 'master' of https://github.com/Bl00drav3n/OBS