#20:  renaming acceptable answers and acceptable options
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop