Merge pull request #35 from Magenic/master

Merging into my main fork.
Initial work for Issue #122
Merge pull request #36 from Magenic/master

Pulling into main fork.
Merge branch 'master' of https://github.com/jwendl/Badge-Application
Fixing issue #122
Merge pull request #37 from Magenic/master

Merging into my main fork
More fixes to work on the badge template links
Merge remote-tracking branch 'origin/Working-Badge-Templates'
Finishing work on Issue #122 and #83
Finishing up some work on #122
Merge pull request #131 from jwendl/master

Merging in changes to get badge template to work into mainline.