Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/table_select.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/table_select.xml
untracked
Merge remote-tracking branch 'origin/master'