merge
Merge branch 'master' of https://github.com/g-mac/AdamWest
implemented video and image storage
implemented eventstorage for picture