no message
Merge branch 'master' of https://github.com/Dreimus/g4_ardrone

Conflicts:
	back/model/Drone.js