Merge pull request #1 from mikaelvonpfaler/master

Pulling in changes from Micke's fork
all assets in ictd file (which I generated server-side)
ICTD installation updates
Merge remote-tracking branch 'upstream/master'