Merge branch 'master' of https://github.com/alexander-dembinsky/softupdate

Conflicts:
	bin/softupdate.dart
	lib/src/controller/controllers.dart
	web/view/upload.html
Merge branch 'master' of https://github.com/alexander-dembinsky/softupdate

Conflicts:
	web/view/upload.html