Changed index.js and users controller to promises
Changed all controllers to promises
Changed all to promises
Merging master