Merge branch 'encrypt'
merge branch with button tags
clean up
codec DefineButtonCxformTag
merge branch with DefineButtonCxformTag
synchronize with master