latest changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	HomCalculation/.idea/workspace.xml