padding
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/common_header_layout.xml