adjustment of mashup and pages I have done prev
changed the sorting options
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into Issue2038