moved angular.module into application.js
merge