added devise password reset view, allow local password reset and cleaned up contact page
merge of work