initial pull from @israelst master
Merge branch 'master' of github.com:israelst/SegPub into israelst-master

Conflicts:
	SegPub/settings.pyc
	SegPub/urls.pyc
	polmil/admin.pyc
	polmil/models.pyc
	polmil/views.pyc