Some changes.
try again
Merge branch 'master' of https://github.com/ja06muen/Siena_CMS_Made_Simple

Conflicts:
	siena_cms_tools/siena_cms_tools.py
Violent Femmes