Added mailer ,added text in form
Fixed mergeconflict in form