work in progress 
Merge branch 'withaddons' of github.com:joshlong/vaadin-and-spring-talk into withaddons

# By Peter Lehto
# Via Peter Lehto
* 'withaddons' of github.com:joshlong/vaadin-and-spring-talk:
  Changed PhoneBookEntryForm to bean

Conflicts:
	src/main/java/demo/MainUI.java