Merge branch 'release/1.3.0.0' into develop
Fix possible code issues
Update version number
Merge branch 'release/1.3.1.0'

Conflicts:
	Properties/AssemblyInfo.cs
Merge remote-tracking branch 'origin/master'