fixed current conflicts in StudentHomePageUiTest
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into Issue2028
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into bootstrap