test
Merge remote-tracking branch 'origin/master'

Conflicts:
	droidfilm/bin/classes/cop/fdiam/droidfilm/MainActivity$1.class