added cocoon & simple form
added routes
solved merge conflicts
Merge branch 'master' into ds_project_views