finished basic Apartment methods
Merge branch 'dev'