Deployment
Merge branch 'develop'
Fixing the hotfix script.
Merge branch 'hotfix/2014-12-02test' into develop