Merge branch 'hotfix/fix_bugs' into develop
Merge branch 'release/29042014-stable'