Add SFRObjectiveResolver
Merge branch 'master' of https://github.com/easydepot/SecurityTarget

Conflicts:
	src/core/sfr/SFR.java