Add camera preview functionality and icon
Merge branch 'master' of https://github.com/eddiew/GradeMe into camera

Conflicts:
	app/build.gradle