Closes #1761
Closes #1744
Closes #1747
Updated Version 3.0.4
Merge branch 'master' into develop

Conflicts:
	version.txt
Removed temporary account comments, and updated Version 3.0.5
Merge branch 'master' into develop

Conflicts:
	version.txt
Closes #1763 & Closes #1764
started removing tasks
Removed / Updated "Todo" comments
Merge branch 'feature-taskremoval' into develop
Updated Version
Merge branch 'hotfix'

sage aborts
Updated Version 3.0.6
Merge branch 'master' into develop

Conflicts:
	version.txt