Options class tests and fixed notice in frontend
Merge branch 'master' into refactor_analytics_api