Merge branch 'hotfix/2014-12-02test' into develop
Updating the commit messages for deployment & hotfixes!
Merging develop branch with master branch.