End of 10-Jul-13
Merge branch 'master' of https://github.com/swatbotics/edm-tools