Gui adattata per video demo(grid view,colori,ecc)
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/aidilab/ble2/BuildConfig.java
	gen/com/aidilab/ble2/R.java
	res/values/strings.xml