refs 2167 - Enable rich text for project summary/conservation/objective
refs #2167 - Enable rich text for project summary/conservation/objective
Merge branch 'master' of github.com:cristiroma/cms.project
Merge pull request #18 from cristiroma/master

refs #2167 - Enable rich text for project summary/conservation/objective
Enabled caption for project image
Merge pull request #19 from cristiroma/master

Enabled caption for project image
Created vocabulary project type
refs #2184 - Added project type and taxonomy
Merge pull request #20 from cristiroma/master

refs #2184 - Added taxonomy project type and field inside the project
refs 2184 - Changed the display formatter
Merge pull request #21 from cristiroma/master

refs 2184 - Changed the display formatter
Updated production settings
Merge pull request #22 from cristiroma/master

Updated production settings