Merge branch 'master' into development
Added first cut of options store for Safari
Merge branch 'safari' into development
Merge branch 'development'