sample
Merge branch 'master' of https://github.com/Thunderstick-Android-Project/Thunderstic-medicare

Conflicts:
	appcompat_v7/bin/android-support-v7-appcompat.jar