application.html updated
merged chatroom branch with master