Merge branch 'hotfix/0.4.1' into develop
activeadmin added
activeadmin installed
Merge branch 'feature/wysihtml5' into develop
settings complete
Merge branch 'develop'