updated some paths
Merge branch 'path-updates'
Merge branch 'master' of github.com:libis/cag_tools

Conflicts:
	classes/header.php