nesto svasta pojma nemam
Merge branch 'dev' of https://github.com/VizioArt/dock into dev

Conflicts:
	crestyl/app/storage/cache/9a/2a/9a2ac8805a6405562f260d8921bc4b62