Updated settings
Updated settings
Merge branch 'v7'
Changed settings for Digital Ocean
Finalizing settings for Digital Ocean deploy
Remove local_settings.py to add a local_settings.py.example
Changed settings for Digital Ocean
Merge branch 'master' of github.com:rooeydaniel/angular_django_todo

Conflicts:
	apps/public/static/js/app.js
	bower.json
Fixed error with missing library and added proposal app