add basic award and award type models and plug them into admin
add awards and convictions to the member detail page
Merge branch 'mk-awards-and-convictions'

Conflicts:
	templates/mks/member_detail.html