viktoria c64d45b758 Merged MilosKozak/dev into dev ... Conflicts: app/src/main/res/values/strings.xml		2017-01-28 22:35:54 +01:00
..
nightscout	Merged MilosKozak/dev into dev	2017-01-28 22:35:54 +01:00