rename to static
uncomment stack options
fix click issue
Merge branch 'develop' of github.com:divio/django-cms into fixes
Merge branch 'FinalAngel-fixes' into static_placeholder

Conflicts:
	cms/stacks/templatetags/stack_tags.py
	cms/templates/cms/toolbar/toolbar.html