trying to merge unchanged files
Merge branch 'master' of https://github.com/kalinatops/pubTracker

Conflicts:
	pubTracker/settings.pyc
	publications/models.py