rails update to 4.0.0, ember to rc6
Merge branch 'master' into sse

Conflicts:
	Gemfile.lock