apartment changes
Merge branch 'master' of https://github.com/dsalvagni/simplescrm

Conflicts:
	config/initializers/apartment.rb