start add fixtures
add tests
Merge branch 'add_fixtures' into add_admin
add tests and select2 widget
fix search
some fix
Merge branch 'new_foreign_keys'

Conflicts:
	app/forms.py
	app/views.py
smallfix regexp