nathan
Merge branch 'master' of https://github.com/Pole-he/MyApps

Conflicts:
	ViewpagerIndicatorlibrary/bin/viewpagerindicatorlibrary.jar
	appcompat/bin/android-support-v7-appcompat.jar