update README
Merge branch 'devel' of https://github.com/mestia/simpleshare into devel

Conflicts:
	README
Merge branch 'devel'
update README