modifica git ignore
risolti conflitti

Signed-off-by: Fons <lord.fontana@gmail.com>
Merge branch 'dev_background' of https://github.com/AndreaCorna/iBeaconOccupancy into dev_background