minor fixes
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into biodiv_usergroups
added more features into ckeditor
Merge branch 'biodiv_usergroups' of github.com:strandls/biodiv into biodiv_usergroups