resource update
Merge branch 'master' of git@github.com:dynamitekinki/AndreamCampus.git