added embedded nREPL server
Started migration to Vaadin 7
resolved merge conflict
Run midje tests on windows command line
Merge remote-tracking branch 'choose_remote_name/master'
Migration to Vaadin 7
Migration to Vaadin 7
Merge remote-tracking branch 'choose_remote_name/master'
Migration to Vaadin 7
Migration to Vaadin 7