upd setup.py
Merge branch 'Stranger6667-master'
rm time parameter with localtime
Merge branch 'master2'

Conflicts:
	setup.py