frm

sandro
Merge branch 'master' of https://github.com/SandroPoli/AmRand

Conflicts:
	web/data/data.html
Merge branch 'master' of https://github.com/SandroPoli/AmRand
Merge branch 'master' of https://github.com/SandroPoli/AmRand
zoom fixed parsing
remove fixed me
new data
Merge branch 'master' of https://github.com/SandroPoli/AmRand

Conflicts:
	web/amrand.dart
prov
prov