add uploadimage
readme
modify classroomlistactivity
rm
Merge branch 'develop' of github.com:hyrtyp/CNP_School into develop
update school
modify fragment's pakagename schoolphotoactivity
Merge branch 'develop' of github.com:hyrtyp/CNP_School into develop
no change
modify ui
cnp-school.iml
Merge branch 'develop' of github.com:hyrtyp/CNP_School into develop
add pic
no change
Merge branch 'develop' of github.com:hyrtyp/CNP_School into develop

Conflicts:
	CNP_School.iml
solve schoolinfo
add new_line
no change