Fixed Java styled getters in HeatController and IncomeController
Merge branch 'master' of https://github.com/piranha771/tdp

Conflicts:
	sep/sep-csharp.v11.suo