Merge branch 'new_master'
Added new temporary icon. I will design a better one soon. Button now calls view page, but is unpopulated
Merge branch 'new_master' into camera
Merge branch 'camera' into new_master