Merge branch 'master' of github.com:braincorp/python-ardrone into improve-video-perf

Conflicts:
	libardrone/arnetwork.py
	libardrone/libardrone.py
Merge remote-tracking branch 'origin/master' into improve-video-perf

Conflicts:
	libardrone/arnetwork.py
	libardrone/libardrone.py
Merge remote-tracking branch 'origin/improve-video-perf' into improve-video-perf

Conflicts:
	libardrone/libardrone.py
Merge remote-tracking branch 'origin/improve-video-perf' into improve-video-perf