update Room DAO and other
Merge branch 'refs/heads/temp'

Conflicts:
	Axalent/Core/Class/Base/Constants.h
Lock status refresh in room view.
Merge branch 'master' of https://github.com/drizztz/Axalent

Conflicts:
	Axalent/Core/UI/Common/LocationViewController.m