Merge pull request #162 from modilabs/master

various updates in particular around media labels
avoid unclean urls
preparation for private submodule approach
cleaned up
Merge pull request #163 from MartijnR/sane_deployment

Sane deployment - phase I
Merge pull request #489 from MartijnR/master

saner deployment