Merge branch 'master' into develop
fixing POD
Merge branch 'develop'
Documentation automatic snapshot - 10:55:03 22/11/2014