Fixing #105, resolving #90

> Re-introducing double spaces for empty parameters
> Fix bug in parser being unable to read without space after colon
Merge remote-tracking branch 'origin/master'

Conflicts:
	Task Data