slice
Merge branch 'master' of 192.168.5.102:~/ccf
lice
Merge branch 'master' of 192.168.5.102:~/ccf

Conflicts:
	resources/models.py
import
adjust Image model
Merge branch 'master' of 192.168.5.102:ccf