replacing scandit with zxing
Merge branch 'master' of https://github.com/jTurnerCPW/sprintAndroid.git

Conflicts:
	Sprint/project.properties
	Sprint/src/com/example/sprint/MainActivity.java