Fixed #300
Fixed #291
Merge branch 'master' of github.com:ippontech/tatami

* 'master' of github.com:ippontech/tatami:
  Update src/main/webapp/css/tatami.css