Make file
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild

Conflicts:
	RaspberryQtApp/zcamp14-schild-qt/Makefile
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild

Conflicts:
	RaspberryQtApp/zcamp14-schild-qt/Makefile
My local makefile. Do never push!
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild
Merge branch 'master' of https://github.com/zuehlke-de/zcamp14-schild