Merge branch 'robert'
Merge branch 'Zeke'
Timeline and pausing
Merge branch 'Zeke'

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