Merge commit '96cabe35f789aac7e83f76e28aa481c32d68d2a6'

Conflicts:
	CaptureEstimote/Shared/CERootViewController.h
	CaptureEstimote/Shared/CERootViewController.m