web.js cleaned up
erased empty function
added models
cleaned up web.js with bugs removed
Merge branch 'staging' into development