updated for drafanddrop
Updated nav bar
Merge pull request #14 from unitedstates/dragndrop

updated for draganddrop
Merge branch 'master' into admin_interface

Conflicts:
	authentication/authentication/authapp/templates/authentication/_base.html
	authentication/authentication/authapp/views.py