Change text
Merge branch 'master' of https://github.com/katrinjahr/shmcode.git

Conflicts:
	AirText/.classpath
	AirText/src/org/sunspotworld/demo/AirTextDemo.java
Merge Test