Adding stuff
MErging
Merge branch 'master' into HEAD

Conflicts:
	.idea/workspace.xml
	src/landlord/person/list/list.js
	src/landlord/person/list/views/person.ejs