marker bugfix
Merge branch 'master' of github.com:moklick/cctvwatch