For merging
Adding range
Merge branch 'master' into s-balance
Tidied up the codebase a little and a little server script
Timer for little message display to disappear
Merge pull request #47 from felamaslen/mht_jma_timer

Timer for little message display to disappear
Merge pull request #46 from felamaslen/bugfix/tidy_up

Tidied up the codebase a little and a little server script
Added batch script
Fixed batch
Merge master: conflict fix
Merge pull request #48 from felamaslen/fela_js

Fela js
Merge master conflict fix
Merge pull request #49 from felamaslen/s-balance

Adding range to units
Merge master: conflict fix