Scholarship payment type
Payment Approval
Animate spinner
Put payment status
Scholarship requestor
Merge branch 'master' into EVENT-97

Conflicts:
	.idea/misc.xml
jshint
Merge branch 'master' into EVENT-97

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/payment.js
	app/scripts/controllers/reviewRegistration.js
	app/views/components/payment.html
	app/views/payment.html
	app/views/reviewRegistration.html
Merge in master
return currentPayment to currentRegistration
Add requester email to form, exclude currentPayment watch function,  rename title to "Event Registration Tool"
Link title to home page if confId is 0
Merge pull request #255 from CruGlobal/EVENT-97

EVENT-97