Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Merge branch 'dev' of https://github.com/DRI-Dev/dricode into live
Delete config.js

Should not be in source control.
Delete config.js

file should not be in source control
Merge branch 'test2' of https://github.com/DRI-Dev/dricode into dev
Merge branch 'test2' of https://github.com/DRI-Dev/dricode into live
rolling back, adding 2 tests
security work
security work
updating query and mongo.js
Delete config.js

deleting config.js so that it doesn't conflict with hosting spot
installed mquery2 and test mq2_test
upserting to angular data model when updatewid is used on an angular page
cleaning up angular code and defaulting wid to 'startwid' in wid controller
Merging Mongo projection code into dev branch
Merge branch 'dev' of https://github.com/DRI-Dev/dricode