change favicon
sorted room menu
Merge pull request #2 from guchio/feature/sorted

sorted room menu
impl TimeLine view
Merge branch 'master' of github.com:yoshik/octochat
Merge branch 'refs/heads/master' into viewport

Conflicts:
	octochat/app/views/main.scala.html