updated db
Merge remote-tracking branch 'origin/master'
removed comments
added controllers