adding models and development.js
fixing merge conflicts