App wrap-up work, minor template refactoring.
Merge remote-tracking branch 'origin/master'
HockeyApp integration + spelling consistency.