[mod] start to remove dependancy on rply customisation, remove conditionnal tokens
Merge branch 'master' of github.com:Psycojoker/baron
Merge branch 'master' of github.com:Psycojoker/baron