Fixed padding
fix padding
Merge branch 'master' of https://github.com/jsh0211/StraightComfort-Android

Conflicts:
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin