type pics for types (ringing/recovery) in slick
Merge branch 'dev' of github.com:lintubongarit/sulka into dev

Conflicts:
	src/main/webapp/resources/js/sulka.core.js