remove weird sort field options
Swap views and remove column
Actually remove self from conflicting sibling list
Use pk instead of id

Also don't assume None means the same as 0.
Merge pull request #706 from drkitty/dynintr-validation-fix

DynamicInterface MAC uniqueness validation fix
Fix admin page to properly post errors and submit with ajax
Merge pull request #685 from church29/Ctnr_Detail_Sort

Remove weird sort field options in ctnr detail view
Merge pull request #708 from church29/CSRF_Admin

Fix admin page to properly post errors and submit with ajax
Merge branch 'master' of https://github.com/OSU-Net/cyder into JS_Refactor

Conflicts:
	media/js/admin.js