Added db and controllers file.
Merge origin/master