design edits
merge
Merge remote-tracking branch 'origin/master'

# By Eric Ponto
# Via Eric Ponto (2) and Jeffrey Lembeck (1)
* origin/master:
  Cleaned up merge
  Precompiled the templates