Merge branch 'dev' of C:\Users\CLTanuki\PyApps\ERP with conflicts.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	planning/urls.py
IN PROGRESS