Fixes and stuff
Merge branch 'master' of https://github.com/desmondmcnamee/Roomease

Conflicts:
	HousePlant/ViewControllers/HPListTableViewCell/HPListTableViewCell.xib
Merge branch 'master' of https://github.com/desmondmcnamee/Roomease
Merge branch 'master' of https://github.com/desmondmcnamee/Roomease