something again for empty to
correct timepicker layout
Merge branch 'master' of https://github.com/leolanzinger/mailclient

Conflicts:
	.idea/misc.xml
	pulltorefresh/build/bundles/debug/AndroidManifest.xml
	pulltorefresh/build/bundles/debug/res/layout/ptr_header.xml
	pulltorefresh/build/bundles/debug/res/values/values.xml
	pulltorefresh/build/bundles/release/AndroidManifest.xml
	pulltorefresh/build/bundles/release/classes.jar
	pulltorefresh/build/bundles/release/res/layout/ptr_header.xml
	pulltorefresh/build/bundles/release/res/values/values.xml
	pulltorefresh/build/incremental/mergeAssets/debug/merger.xml
	pulltorefresh/build/incremental/mergeAssets/release/merger.xml
	pulltorefresh/build/incremental/packageResources/debug/merger.xml
	pulltorefresh/build/incremental/packageResources/release/merger.xml
	pulltorefresh/build/libs/pulltorefresh.aar