- Installing rvm automatically
Merge branch 'master' of https://github.com/hourback/docker-ember.js

Conflicts:
	Dockerfile