Exclude folders docs and example from setup install
Merge branch 'master' of github.com:lerrua/django-placeholder into lerrua-master

Conflicts:
	setup.py
Merge branch 'lerrua-master'