Merge branch 'master' of github.com:andrefigueira/Vine

Conflicts:
	README.md
- Readme fixes
Merge tag 'fixes' into develop

- Fixes