f
Merge branch 'master' of github.com:lemonprogis/asyo

Conflicts:
	new_db.sqlite3
	registration/reg_forms.pyc
	registration/views.pyc
pre pull
s
Merge branch 'master' of github.com:lemonprogis/asyo

Conflicts:
	new_db.sqlite3
another commit