rename "iam" to "token" in tokenservice path. related to changes in tokenservice
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/whydah/identity/usertoken/SecurityTokenHelper.java
rename "iam" to "token" in tokenservice path. related to changes in tokenservice