Update forms inline
Merge branch 'aira_cbv' of https://github.com/kickapoo/aira into aira_cbv

Conflicts:
	aira_project/settings/aira.db