Committer: ak <ak@fe10M2.finfort.com>

 On branch dev

	modified:   dev/roles/web/templates/django.ini

	deleted:    dev/Ansible/PP.yml
	deleted:    dev/photoplanet
	modified:   photoplanet/photoplanet/settings/base.py
Merge branch 'dev' of https://github.com/dudarev/photoplanet into dev

Conflicts:
	dev/roles/web/templates/django.ini