nothing change

nothing change
Merge remote-tracking branch 'origin/master'

Conflicts:

	TabsWithSwipeGesture/bin/classes/info/androidhive/tabsswipe/CreateList.class
	TabsWithSwipeGesture/bin/classes/info/androidhive/tabsswipe/R$id.class
	TabsWithSwipeGesture/bin/resources.ap_
	TabsWithSwipeGesture/gen/info/androidhive/tabsswipe/R.java
	TabsWithSwipeGesture/src/com/SIMBA/Welcome/LoginActivity.java