Integrate pay, and change 'awaiting' to 'planning'
actual pay rate now used
Merge pull request #91 from aspett/hotfix/integrate_pay

Integrate pay, and change 'awaiting' to 'planning'
fixed all exportingto dump almost everything
Export fixes
fixed bad tests
Merge pull request #92 from aspett/feature/fix_export_pay_rate

actual pay rate now used
fixed tests
And again
Merge branch 'integration' into feature/fix_exports

Conflicts:
	app/models/tutor_application.rb
Merge branch 'feature/fix_exports' into integration
Merge branch 'integration'