Quiz Results Almost Done
Merge branch 'master2' of https://github.com/Paradigm-FGCU/bonsai.git
into master2

Conflicts:
	Bonsai/project.properties
	Bonsai/src/org/bonsai/activities/ResultActivity.java
Merge branch 'master' into master2
Merge branch 'master2' of https://github.com/Paradigm-FGCU/bonsai.git into master2
Merge branch 'master2'