change 'new'
Merge branch 'master' of https://github.com/bluerespect/edx_conf

Conflicts:
	djangojs.po
	mako-studio.po
	mako.po