Added the ctools and views modules
Merge branch 'develop'