Merge branch 'Zeke'
Merge branch 'master' into robert
Comment weird path behavior.
Merge branch 'robert'
Merge branch 'Zeke'
Merge branch 'Zeke'

Conflicts:
	source/moneymoney.cpp
Merge branch 'master' into Zeke