Merge branch 'master' into dev
removed theme options
Merge branch 'dev'
Merge branch 'master' into release