View refactoring step I
Merge branch 'master' into develop
added helper function to addFilterForm
Reversed change by loading template
Finalizing Views of AR