fix model template to use decorator over model, not the __str__ method
Merge pull request #5 from andriis/master

fix model template to use decorator over model, not the __str__ method
updated model defaults
updated template to fit cookiecutter-django
updated template to fit cookiecutter-django
bugs
un_bug
some crispy goodness
some reversion + import-export goodness
app navbar + namespaced urls
needs to extend app base template
fix menu
view actions; default manager for list; new rather thancreaate
Updated external libraries

Bootstrap to 3.1.1
Merge pull request #7 from ikkebr/patch-1

Updated external libraries
Merge branch 'master' of https://github.com/wildfish/cookiecutter-django-crud
Merge branch 'master' of https://github.com/cericoda/cookiecutter-django-crud

Conflicts:
	requirements.txt
	{{cookiecutter.app_name}}/admin.py
	{{cookiecutter.app_name}}/models.py
	{{cookiecutter.app_name}}/templates/base.html
	{{cookiecutter.app_name}}/urls.py
	{{cookiecutter.app_name}}/views.py