Merge remote-tracking branch 'origin/master'
Merge branch 'master' into devel
Handling counseling id error and some styling for the dashboard
Installing WYSIWYG and tinyMCE modules

For text editing with extra formatting options