Upgrades to admin.
remove model properties.
Fixing manager.
fix refrences for old style.
Removing caption, moving controls to a modal.
Moving and changes to album listing.
updates to modal syntax.
small 404 page change.
Merge branch 'develop' into feature/documentation_update

Conflicts:
	fotochest/administrator/templates/administrator/dashboard.html
	fotochest/administrator/urls.py
Merge branch 'master' into feature/documentation_update

Conflicts:
	apps/administrator/templates/administrator/albums.html
	apps/administrator/templates/administrator/base.html
	apps/administrator/urls.py
	apps/photo_manager/models.py
	fotochest/administrator/static/administrator/js/admin.js
	fotochest/administrator/templates/administrator/nav.html
	fotochest/administrator/views.py
	fotochest/photo_manager/managers.py
	templates/404.html
Merge pull request #163 from dstegelman/feature/documentation_update

Feature/documentation update