changing naming convention and added lock
Merge branch 'master' of github.com:rrah/Devices into HEAD

Conflicts:
	videohub.py
Merge branch 'master' of github.com:rrah/Devices