Bug fixes and new features.

Fixed Focus/Position time out bug.
Fixed 5 Second Delay cancel bug.
Added Hi/Lo brightness preference.
Merge branch 'master' of https://github.com/Cardiomac/basic-lamp-controller

Conflicts:
	.DS_Store

first commit