rm dead link
update dockerfile
update dockerfile
capistrano gem
update Dockerfile
Merge branch 'master' into develop

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock