refactored welcome controller
fixed merge conflicts in resovisions.js
fixed merge conflicts in resovisions.js
fixed merge conflicts in resovisions.js