Converted to use Vaadin 7.1 with built in Calendar and push.

Fixed broken locking in previous version and did some cleanup.