Update To camera Display

Tried to make it more platform independent.
The general idea has been implemented but it still needs to be tweaked
Merge branch 'master' of https://github.com/js07n/ScramDv1.3
MAJOR ISSUES!!

Conflicts:
	gen/edu/fsu/cs/scramd/R.java
	res/layout/fragment_camera.xml
	src/edu/fsu/cs/scramd/main/LogIn.java
FIXED R.JAVA & MANIFEST.JAVA ISSUES

:D