Added per RP token type support
Merge pull request #319 from thinktecture/per-rp-tokentype

Added per RP token type support