dummy
Merge branch 'python' into webapp_dum

Conflicts:
	flask/storage/new.fs.lock
	flask/storage/userdb.fs
	flask/storage/userdb.fs.lock
the commit from dummy MacBook Pro.

( some valuable changes are there)
Merge branch 'webapp_dum' into python