Add addressbook entry to forms
Merge concurrent addressbook form creation together

Conflicts:
	bmwa/forms.py