Fixed #291 #295 #296 #299 #298 #297
Merge branch 'master' of https://github.com/johnpelquingua/freightbit-logistics