test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.project
megamcommon dependency added
private uid
Merge pull request #37 from thomasalrin/master

megamcommon dependency added