Update
Merge branch 'develop' of github.com:meriadec/perfect-home into develop

Conflicts:
	.profile