upload 31.05.2014
Merge branch 'master' of https://github.com/rh9/cam