various economics bugfixes
Various bugfixes. (#463, #462, #461, #460, #459, #458)
Merge branch 'master' into refactor-economics-wip

Conflicts:
	css/ccap-economics.css
Various bugfixes, regression fixes, fixes for Pr comments on #465
Removing a temporary (auto-generated) backup file which was accidentally commited
Merged master into refactor-economics-wip.
Merge pull request #465 from Connexions/refactor-economics-wip

Refactor economics