Merge branch 'master' of https://github.com/cantalou/AndroidSkinChange

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/cantalou/android/sample/activity/SkinActivity.java
	app/src/main/java/com/cantalou/android/sample/activity/SkinFragmentActivity.java
	app/src/main/java/com/cantalou/android/sample/activity/SkinTwoActivity.java
	library/src/main/java/com/cantalou/skin/content/res/SkinResources.java
	library/src/main/java/com/cantalou/skin/handler/actionbar/ActionMenuItemViewHandler.java
	public/ids.xml
	public/public.xml
	public/timestamp.txt