activeadmin added
activeadmin installed
Merge branch 'feature/wysihtml5' into develop