Options
Merge branch 'master' into v2.2.0
Bump to 2.2.0
add back google search option for development
Changes proposed by olivitek