Last working rev; needs review
Merge branch 'master' of https://github.com/cthree/LightBee

Conflicts:
	LightBee.xcodeproj/project.pbxproj
	LightBee/en.lproj/MainStoryboard.storyboard