...
...
...
Merge branch 'origin_master'

Conflicts:
	chargecodes.pyw
	constants.py
	timeentry.pyw