rjtownsend/clair — pull request #4 by thesleuth (2014-04-03 01:19:57+00:00)
Title: fixing conflicts

This should fix the "Overridden" issue. Also, added the CMS administrator role and permissions