Tweaks and fixes for forms and rubric pages
Merge branch 'master' of git://github.com/MarkUsProject/Markus into form-tweaks
Merge pull request #1645 from arkon/form-tweaks

Tweaks and fixes for forms and rubric pages