just a test
commit with eclipse
Merge branch 'master' of https://github.com/diufanshu/CriminalIntent.git

Conflicts:
	libs/android-support-v4.jar