Finish Martin_21072014
Merge branch 'origin/develop'