cost calculations for registration
Merge branch 'master' of ssh://github.com/patr7/conf-reg-sys

Conflicts:
	src/controllers/ConferenceRegistrationController.java