oh
Merge branch 'tmp' into 2.0

Conflicts:
	app/views/node/index.html.erb
OK