20 fixed click on link bug
Merge branch '20_newOptionMenu' into develop