Keep the codeStyleSettings.xml under control.
Merge branch 'develop' of https://github.com/kensodemann/HomeApp into develop

Conflicts:
	.gitignore