Use Resources.deepEquals
Merge branch 'master' of github.com:bedatadriven/activityinfo

Conflicts:
	core/model/src/main/java/org/activityinfo/model/resource/Resource.java