clean up main branch
blah
Merge branch 'devise' into LawyerProvince