s
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/jerome/utils/media/BitmapUtils.java