s
Merge remote-tracking branch 'origin/master'

Conflicts:
	viewflow-example/src/org/taptwo/android/widget/viewflow/example/DiffAdapter.java