-
resolving conflicts tfs
tfs conflicts resolved; update pastOrderItem.htm;
updated base path on require-config.js to work with dev env
adding back publishingimages/icon
adding libs/jquery.js back to project (affecting deploy)
adding updated version of jquery.validate