Merge branch 'develop'
Bumped build number to 13
Merge branch 'master' into develop