Merge branch 'master' into task/310-release
Merge branch 'task/31x-website' into task/310-release
I no longer count as the main contributor to this file
Hopefully setup.sh should now run without commiting
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release

Conflicts:
	setup.sh
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Merge branch 'task/31x-website' into task/310-release
Add downloads controller inital work

WEBSITE-1083
Add Download Entity

WEBSITE-1083
Add a method to the entity which allows setting the configurable options and sets the time.

WEBSITE-1083
Remove branch

WEBSITE-1083