servicecommit 140613
Merge branch 'master' of https://github.com/ruediheimlicher/raspberry_cam

Service-commit