adding transfer to from form to cal_activity
Merge branch 'master' of https://github.com/ashnasquared/thetitanic