updated the app
Updated bower and package.json
fiex merge conflicts
Merge pull request #1 from TalentWorks/dev

OK