Merge branch 'master' of github.com:gwilymhumphreys/django-happybase

Conflicts:
	project/settings.py
Added bootstrap 2
Added bootstrap 2
removed static dir
Extended library models
Extended library models
Extended library models
Extended library models
move snippets to include
move snippets to include
pre settings delete
Merge branch 'master' of github.com:gwilymhumphreys/django-happybase