Design added
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/dimens.xml
Design added