Final commit for info page addition
Merge branch 'info_page' into dev