add resources from 3 to 7
Merge branch 'master' of https://github.com/infurno/cfs

Conflicts:
	resources.php