Fixed Date Parsing Issue

Fixes #381
Minor code style tweaks

* Remove spurious empty lines
* Wrap lines at 100 chars
Fixed an amount parsing error in expressions

Fixes #379
Merge branch 'master' into develop

Conflicts:
	core/model/date.py