First Stage of URL Authentication
Small Changes
Merge branch 'urlPermissions'
Merge branch 'master' of https://github.com/avaleske/SharkEyes

Conflicts:
	pl_chop/views.py