fixed error caused by rendering forms in prfile views
Merge branch 'developing'
Cleaned up medic form
Resolved conflicts before merge
styled profile page
Merge branch 'master' into confirmable