1
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	NineOldLibrary/bin/ninelibrary.jar
	PullToRefresh _library/bin/pulllibrary.jar
	ViewPagerIndicator_library/bin/viewpagerlibrary.jar
	appcompat_v7/bin/android-support-v7-appcompat.jar