Merge branch 'master' into imac-work
added global header partial for layouts
added rss icon to course feed list
added htmlpurifier

created custom filter for forms using htmlpurifier
Merge pull request #148 from californiavol/imac-work

Imac work