changes
Merge branch 'master' of https://github.com/ysofologis/web_components

Conflicts:
	MyTodo/server/mytodo/app/using_eve/settings.py