fix views
Merge branch 'vicente'
Adds Answers and Questions