fixes for angular app on heroku
rebasing to develop
fix conflicts
changed to pg
adding bower files
fix conflict
fixing buildpacks