Another update: ready for testing
Merge branch 'MAP' of github.com:zhenbinwu/CMSUpgrade into MAP