Add Boostrap to add-academic room
Merge with master