Version bumped
Merge branch 'release/201407041308'
Merge tag '201407041308' into develop

Version 201407041308
Some fixes