The launch container now read and launch your stored images
Merge branch 'master' of https://github.com/BDL-Hacks/Docker

Conflicts:
	docker/manager/views.py
Merge branch 'master' of https://github.com/BDL-Hacks/Docker

Conflicts:
	docker/manager/forms.py
Fixing merge issues
Merge branch 'master' of https://github.com/BDL-Hacks/Docker

Conflicts:
	docker/manager/templates/manager/container_details.html
Got buttons to work in theory