add showMaskOnFocus option
Merge branch '1.x' into 2.x
added showMaskOnFocus option (forgot to commit the actual change)
Merge branch '1.x' into 2.x
moved greedy and repeat option to the maskset
prepare for inline repeat and greedy