Semi working image capture and scope image capture --ADJ
More
Merge branch 'master' of https://github.com/donaldheer/TekScholar2014Client

Conflicts:
	TekScholarClientProject/TekScholarClient/src/main/java/com/tekscholar/androidclient/MainActivity.java