Merge branch 'develop'
precompile assets