ignoring dist/
Merge branch 'develop'

* develop:
  changed server/views to app/views