general update
Merge remote-tracking branch 'origin/master'

Conflicts:
	dragswipeundo listview/res/drawable-hdpi/header_shadow.xml
	dragswipeundo listview/res/layout/list_row.xml