Bump version in bower.json
Merge remote-tracking branch 'origin/v2.0' into v2.0-fix-picture-resize

Conflicts:
	bower.json