m

v-1.1
---
Just committing
B2

v-2.1-e2-t1
---
1. Just committing
Merge branch 'master' into B2_add_new_image_from_device

Conflicts:
	win_command_history.txt
B2

v-2.1-e2-t3
---
1. Posting data from device => Tried fixing