add/remove
removed files
test
Mrge branch 'master' of github.com:jevonyeoh/ccapp

Conflicts:
	TestMainActivity/bin/classes/com/example/ccapp/test/MainActivityTest.class
	ccapp/AndroidManifest.xml
	ccapp/bin/dexedLibs/android-support-v4-55aa3a68be4ed50263a597a37ea81024.jar
Merge branch 'master' of github.com:jevonyeoh/ccapp

Conflicts:
	ccapp/bin/classes/com/example/ccapp/NameList$ListFragmentItemClickListener.class
test