bump version
Update README.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bower.json