Merge branch 'master' of https://github.com/noktigula/CalcMyMoney

Conflicts:
	CalcMyMoney.iml
	local.properties