Commit before getting Sam's latest.
Merge branch 'master' of https://github.com/sjg10/glass-context.git

Conflicts:
	Context/src/com/coolrunnings/context/MainActivity.java
Follow up conflict resolving.
Changed to Camera controlling instead of build in google glass camera.