Merge pull request #198 from abreckner/master

Pagination bug fix
Fixes issue #201
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Fixes #201. small refactoring
Merge pull request #203 from msevestre/ckeditor_bug

Fixes issue #201
Merge pull request #2 from jipiboily/master

Merging latest master