alut
Merge branch 'master' of https://github.com/Azzale/Oxiane-push-chrome
slt
Conflicts:
	conversation.html
	conversation.js
	listPeople.html
	manifest.json
	register.js