ss3 updates
updated templates to ss3 tags
3.1 update
Merge branch 'ss3'

Conflicts:
	_config.php