merge remote-tracking branch 'origin/master'

Conflicts:
	examples/test.py
hover loop and fps
Merge branch 'master' of github.com:phillipwei/crazyflie-clients-python

Conflicts:
	examples/test.py