Add camera Activity
Merge branch 'Nik_Branch' of https://github.com/njb26/3093_Software_Engineering_2013 into Nik_Branch