John pulling
With exchange rate stuff
Merge branch 'master' of https://github.com/alt2014/planit