Correct version
Make classes serializable (#9)
Helper for getting the peer for a wrapper
Use Vaadin 6.8.7
Simplified "demo application"
Organize imports
Wrappers for AbstractMedia, Video and Audio
Merge branch '2.2' into 3.0

Conflicts:
	addon/src/main/scala/vaadin/scala/Application.scala
	addon/src/main/scala/vaadin/scala/ComponentContainer.scala
	addon/src/main/scala/vaadin/scala/Window.scala
	demo/src/main/scala/vaadin/scala/demo/DemoApplication.scala
	project/Build.scala
forgotten file from merge