1
Merge branch 'master' of https://github.com/ivancxj/edu.git

Conflicts:
	edu_school/res/values/array.xml