webapp
Package GUI
GUI test
GUI update 1.1
Package Model
test
Merge branch 'master' of
https://github.com/wissi1/ch.bfh.btx8081.w2013.red.git

Conflicts:
	src/main/java/GUI/MyVaadinUI.java
Merge branch 'master' of https://github.com/wissi1/ch.bfh.btx8081.w2013.red.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/GUI/MyVaadinUI.java