feature 7-1
feature 7-2
Squashed commit of the following:

commit 0993a1b039072157544ee21bb5fbabb6f95cdd95
Author: ab <adamdd55@gmail.com>
Date:   Tue May 13 20:47:29 2014 +0200

    feature 7-2

commit a0de954df3aa7f0a938144bf2c14061843d18387
Author: ab <adamdd55@gmail.com>
Date:   Tue May 13 20:47:04 2014 +0200

    feature 7-1
Merge branch 'feature/7seven' into release/release1