Update README.md
Update README.md
Update README.md
Update bower.json
Merge branch 'master' into v2-dev

* master:
  Update bower.json
  Update README.md
  Update README.md
  Update README.md

Conflicts:
	bower.json
Fix from merge