ggg
test
gg
Merge branch 'master' of https://github.com/T-SOP/electko

Conflicts:
	news/__init__.pyc
	news/admin.pyc
	news/models.pyc
	news/services.pyc
	news/urls.pyc
	news/views.pyc
g