Merge branch 'develop'
fixed static file loading, form validation working