concat instead of uglify

uglify has issues to fix
refactored controller names
updated Gruntfile
grunt for protractor
specs for e2e