white man can commit so files
grammar nazi refuctor

elementary school stuff
when you have one (1) of something, that's singular
when you have more, that's plural
when it's plural, it has 's' suffix
SO DONT USE FUCKIN PLURAL CLASS NAMES FOR SINGULAR STUFF!!!
refuctored controllers away from data
Merge remote-tracking branch 'origin/murielm' into murielm

Conflicts:
	zipato_android_v2/code.properties
	zipato_android_v2/src/main/java/com/zipato/appv2/TestCameraActivity.java
merge