Incorporates disclaimer - with demo being used for all controllers
Adds disclaimer objects to active admin
Caches gems again
Merge branch 'develop'