upgrade velocity. doc changes for css-refactor branch merge