Updated ctools and views
Merge branch 'dev' into prod