ok

codewtwt
Merge remote-tracking branch 'origin/master'

Conflicts:
	SlidingMenuVN/source/example/bin/resources.ap_