Implemented tariffing rules
minor formating fixes
Magic numbers replaced with constants. Ceiling and isWeekend moved to functions
Some formating fixes.
Blocks implementation modified.
Fix .filters file.

.filters file structure was broken. The line with opening tag for
Utility.cpp was misplaced for some reason.
Merge pull request #1 from 4d6178/add-tariffing-rules

Fix .filters file.
Merge pull request #5 from swat32exe/add-tariffing-rules

Implemented tariffing rules
Merge remote-tracking branch 'upstream/master' into add-json-library