Merge commit
Merge branch 'master' of github.com:jponf/PCnstein

Conflicts:
	PCnstein/urls.py
Fixed merge error