conflict fix
Merge branch 'master' of github.com:acemtp/meteor-france
Merge branch 'master' of github.com:acemtp/meteor-france
Merge branch 'master' of github.com:acemtp/meteor-france

Conflicts:
	smart.lock
Merge branch 'master' of github.com:acemtp/meteor-france