fixed a small bug and collection template
Merge branch 'master' of https://github.com/millew2/Reggie