added CKEditor plugin that allows adding new fragments into article
added ability to edit inserted fragments
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/resources/ckeditor/config.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/resources/ckeditor/config.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	educomplex-web/src/main/webapp/resources/ckeditor/config.js
Merge remote-tracking branch 'origin/master'
fragment types are loaded from database now
article fragments are saved in database and on disk now
merged origin/master
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fixed article save

workaround for ArticleDAOTest (temporary!)
load fragments' titles and full contents in getArticleContents
Merge remote-tracking branch 'origin/master'
fragment title and type are displayed together in bold now
anchors are added before fragments

added boolean flag to getArticleContents telling whether we need to retrieve whole fragment contents
Merge remote-tracking branch 'origin/master'
renamed schema file so that it has actual date