post added
wip
wip
wip
Merge tag '201407010851' into develop

201407010851
wip
wip
Final version
Merge branch 'feature/oop3' into develop
Version bumped
Merge branch 'release/201407041308'