Reorganize manifest tags
Add media folders inhrited from the installer
Merge pull request #17 from OSTraining/master

Update from master