assets done
controller section
model section
views section
docs
Merge branch 'develop'