Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
add test
Merge branch 'master' of github.com:hyrtyp/ChildeduProject

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	actionbarsherlock/build/bundles/debug/classes.jar
	actionbarsherlock/build/bundles/debug/res/values-land/values.xml
	actionbarsherlock/build/bundles/debug/res/values-large-hdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/debug/res/values-large-land-hdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/debug/res/values-large-land-mdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/debug/res/values-large-mdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/debug/res/values-sw600dp/values.xml
	actionbarsherlock/build/bundles/debug/res/values-v11/values.xml
	actionbarsherlock/build/bundles/debug/res/values-v14/values.xml
	actionbarsherlock/build/bundles/debug/res/values-w360dp/values.xml
	actionbarsherlock/build/bundles/debug/res/values-w480dp/values.xml
	actionbarsherlock/build/bundles/debug/res/values-w500dp/values.xml
	actionbarsherlock/build/bundles/debug/res/values-w600dp/values.xml
	actionbarsherlock/build/bundles/debug/res/values-xlarge/values.xml
	actionbarsherlock/build/bundles/debug/res/values/values.xml
	actionbarsherlock/build/bundles/release/classes.jar
	actionbarsherlock/build/bundles/release/res/values-land/values.xml
	actionbarsherlock/build/bundles/release/res/values-large-hdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/release/res/values-large-land-hdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/release/res/values-large-land-mdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/release/res/values-large-mdpi-1024x600/values.xml
	actionbarsherlock/build/bundles/release/res/values-sw600dp/values.xml
	actionbarsherlock/build/bundles/release/res/values-v11/values.xml
	actionbarsherlock/build/bundles/release/res/values-v14/values.xml
	actionbarsherlock/build/bundles/release/res/values-w360dp/values.xml
	actionbarsherlock/build/bundles/release/res/values-w480dp/values.xml
	actionbarsherlock/build/bundles/release/res/values-w500dp/values.xml
	actionbarsherlock/build/bundles/release/res/values-w600dp/values.xml
	actionbarsherlock/build/bundles/release/res/values-xlarge/values.xml
	actionbarsherlock/build/bundles/release/res/values/values.xml
	actionbarsherlock/build/incremental/mergeResources/debug/outputs.data
	actionbarsherlock/build/incremental/mergeResources/release/outputs.data
	actionbarsherlock/build/incremental/packageResources/debug/outputs.data
	actionbarsherlock/build/incremental/packageResources/release/outputs.data
	actionbarsherlock/build/libs/actionbarsherlock-debug.aar
	actionbarsherlock/build/libs/actionbarsherlock-debug.ap_
	actionbarsherlock/build/libs/actionbarsherlock-release.ap_
	actionbarsherlock/build/libs/actionbarsherlock.aar
	actionbarsherlock/build/res/all/debug/values-land/values.xml
	actionbarsherlock/build/res/all/debug/values-large-hdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/debug/values-large-land-hdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/debug/values-large-land-mdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/debug/values-large-mdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/debug/values-sw600dp/values.xml
	actionbarsherlock/build/res/all/debug/values-v11/values.xml
	actionbarsherlock/build/res/all/debug/values-v14/values.xml
	actionbarsherlock/build/res/all/debug/values-w360dp/values.xml
	actionbarsherlock/build/res/all/debug/values-w480dp/values.xml
	actionbarsherlock/build/res/all/debug/values-w500dp/values.xml
	actionbarsherlock/build/res/all/debug/values-w600dp/values.xml
	actionbarsherlock/build/res/all/debug/values-xlarge/values.xml
	actionbarsherlock/build/res/all/debug/values/values.xml
	actionbarsherlock/build/res/all/release/values-land/values.xml
	actionbarsherlock/build/res/all/release/values-large-hdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/release/values-large-land-hdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/release/values-large-land-mdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/release/values-large-mdpi-1024x600/values.xml
	actionbarsherlock/build/res/all/release/values-sw600dp/values.xml
	actionbarsherlock/build/res/all/release/values-v11/values.xml
	actionbarsherlock/build/res/all/release/values-v14/values.xml
	actionbarsherlock/build/res/all/release/values-w360dp/values.xml
	actionbarsherlock/build/res/all/release/values-w480dp/values.xml
	actionbarsherlock/build/res/all/release/values-w500dp/values.xml
	actionbarsherlock/build/res/all/release/values-w600dp/values.xml
	actionbarsherlock/build/res/all/release/values-xlarge/values.xml
	actionbarsherlock/build/res/all/release/values/values.xml
	actionbarsherlock/build/source/r/debug/com/actionbarsherlock/R.java
	actionbarsherlock/build/source/r/release/com/actionbarsherlock/R.java
	settings.gradle