restructur
Merge branch 'master' of github.com:AlexBarauskas/rovar2

Conflicts:
	blog/views.py
	manager/forms.py
	manager/models.py
	rovar.db
.