commit
Merge branch 'master' of github.com:dimonsizon/HomeItEasy

Conflicts:
	HomeItEasy/HomeItEasy.v11.suo