Lots of work on the server
Merge branch 'master' of https://github.com/lambertjamesd/SmartTransact