Add user picture
Add gender to user
Add TEACHER_ROLE, STUDENT_ROLE & PARENT_ROLE
add jquery, jquery ui, colorbox files
Merge remote-tracking branch 'upstream/master'
update conflict files