Converted the manage scripts to a single script, removed the non-global container bin scripts
Added parent docker box
Merge branch 'DEV'

Conflicts:
	manage/_container
	manage/_docker.sh
	manage/_settings.sh
	manage/dockerparent/Dockerfile
Merge branch 'DEV' - some bigger changes merged here

Conflicts:
	manage/parent/Dockerfile
Removed temp file from last merge
Merge branch 'DEV'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/DEV'
Removed deprecated conf folder
Merge branch 'DEV'

Conflicts:
	manage/hooks/settings/020_settings.sh
Merge branch 'DEV'
Emptied saved container, which should not have been commited with a value
Merge branch 'DEV'
Merge branch 'DEV'
Removed deprecated manage script left in master branch
Merge remote-tracking branch 'origin/DEV'
Merge remote-tracking branch 'origin/DEV'
Merge remote-tracking branch 'origin/DEV'
Merge remote-tracking branch 'origin/DEV'
Merge remote-tracking branch 'origin/DEV'
Merge remote-tracking branch 'origin/DEV'