Merge branch 'encrypt'
merge branch with button tags
clean up
merge branch with DefineButtonCxformTag
clean up
opcode decoding bugfix
synchronize with master