Updated Version
Fixes bug with default data setup, and full update file.
Merge branch 'hotfix'
Updated Version 3.0.11
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-reporting