Merge branch 'release-1.2'
Merge branch 'release-1.3'
Bumped version number to 1.3.1
Fixed server production problem
Merge branch 'hotfix-1.3.1' into develop