fixing bower build
fixing grunt build task
fixing build
fixing conflicts
Merge branch 'master' of heroku.com:pac-info