Merge branch 'master' of https://github.com/texane/stlink

Conflicts:
	Makefile
	doc/tutorial/tutorial.pdf
	example/blink/Makefile
	flash/main.c
	src/stlink-common.c
	src/stlink-usb.c

Mostly whitespace conflicts it seems.