ButtonListenerFactory.java is rdy to test
Merge branch 'master' of https://github.com/iBot/WP_SHC

Conflicts:
	MyController/src/de/haw/shc/utils/ButtonListenerFactory.java