Better design
Merge branch 'master' of github.com:lfuelling/textie-web

Conflicts:
	src/main/java/net/k40s/Receiver.java