0.8.4+1 fix yaml file
Merge remote-tracking branch 'origin/master'

Conflicts:
	pubspec.yaml
0.8.4+1 fix yaml file