Merge remote branch 'upstream/master'
Init github repo
Merge branch 'master' of https://github.com/root186643/paas-appli-updater

Conflicts:
	README.md
merged repository cleaned