Refactor test class
Merge branch 'master' into salidinov2
Add adout, contact and help views
fix conflict
fix conflict2
fix conflict from merge