1. modify something
First open develop branch.
Because different android platform , so add some new file automaticly.
Merge branch 'develop'

Conflicts:
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/styles.xml
1,add new