Updated firmware

Minor changes
Merge branch 'master' of https://github.com/volodink/nrfFlasher

Conflicts:
	firmware/nrfflasher/nrfflasher.ino