Merge branch 'dev'
Merge branch 'dev'
Update README.md
update to bower
Merge pull request #1 from csicar/master

Master