Commit for commit
Merge branch 'master' of https://github.com/vgulaev/sitenewwave.git

Conflicts:
	core.py