Merge branch 'master' into develop
Merge branch 'develop-testingupdates' into develop

Conflicts:
	sjfnw/templates/admin/index.html
updated registration to handle pre-existing orgs. #330 tentatively working
commented out debug logging
added test for existing org registering. #330
logging tweaks
clarifying verbose/desc for org fields
took out element type when combined with id
reformatted base a bit so it is more generic (can be used for reporting). also updated jquery version
broke types into seperate included templates. started on toggle
working on reporting #585
script to make admin account management easier
working on restructured reporting #585
working on view for award reports. #585
added contact person fields to org #583. award reporting now works #585
got basic org reporting working, including related objs. #585
match form to report type selection on load. #585
working on a generic reporting form #585
org profile readyonly #588
reviewed app reporting & updated award inclusion. #585