OASP page reorganized; common template (Bootstrap) used consistently
Merge remote-tracking branch 'origin/master'