Classes rewritten
Merge remote-tracking branch 'origin/master'

Conflicts:

	GlassRecognition/InformationPreview/bin/classes/com/example/informationpreview/CardScrollActivityOne.class