Fixed Camera Crashing, improved Note Taking view
Merge branch 'master' of https://github.com/janvillarosa/mobicom-echonotes

Conflicts:
	Echonotes/bin/Echonotes.apk
	Echonotes/bin/classes.dex
	Echonotes/bin/resources.ap_