no message
Merge branch 'develop' of https://github.com/jeissie/MakeMoney into develop

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
no message
no message
add text view in bottom