translate is added
before merge
Merge branch 'webdesign' of https://github.com/vpluzhnikov/confcenter
Merge branch 'production' of https://github.com/vpluzhnikov/confcenter
Merge branch 'production' of https://github.com/vpluzhnikov/confcenter

Conflicts:
	confcenter/log/upload.log
merge with production
Production v1.1
Production v1.1