Many changes
Merge branch 'master' of https://github.com/desmondmcnamee/Roomease

Conflicts:
	HousePlant/ViewControllers/HPListTableViewCell/HPListTableViewCell.m