Restored rubric functionality
Merge branch 'dev' of github.com:MitchelCabuloy/Syllia into dev