Merge branch 'master' into about-page
Merge branch 'gkoo' into about-page
Update transition changes.
Merge branch 'about-page' into eventh
Update version info on about page for bootstrap-modal.