Squashed commit of the following:

commit 6c33a939015b0a208c36dc6ec68b6d584458e1bb
Merge: 1a2726e 17bc251
Author: Johan Enell <johan@enell.nu>
Date:   Tue Dec 9 14:09:28 2014 +0100

    Merge branch 'Feature_2' of https://github.com/enell/Test-Merge

    * 'Feature_2' of https://github.com/enell/Test-Merge:
      another team branch

commit 17bc2515e7d3060521f139137ce0d42b1baac546
Author: Johan Enell <johan@enell.nu>
Date:   Tue Dec 9 14:07:46 2014 +0100

    another team branch

commit 1a2726e6ed5b2082970e878254be3532ee745d32
Author: Johan Enell <jnl@qlik.com>
Date:   Mon Dec 8 16:21:03 2014 +0100

    Pull Request from something else