Feature update: add delivery (store geo information for customers)
misc update (adding map)
pulled master