feat14-1
f15-1
Merge branch 'feature/f15' into develop
mergetool- cleaning
f16-1
Squashed commit of the following:

commit 63f5d12d44eefbf70cb17a54cba0babc93c075ea
Author: ab <adamdd55@gmail.com>
Date:   Fri May 16 15:27:02 2014 +0200

    f16-1
Merge branch 'feature/f16' into develop