template render
delete debug
Merge remote-tracking branch 'origin/master' into 140823_add_storage_class

Conflicts:
	application/__init__.py