Updated for latest SDK locations
Merge remote-tracking branch 'upstream/master' into loginscreen

Conflicts:
	HMSS/src/mediators/IndexMediator.as
	HMSS/src/mediators/target/TargetLocation.as