Merge remote-tracking branch 'upstream/master'
Updated bower.json
Merge pull request #4 from Baldrs/develop

Updated bower.json to match latest tag version