small html fix | db migrate
Merge branch 'dev' into Clownfish

Conflicts:
	db/schema.rb
db schema update
fix date use in room view
test pending