xyx
Merge branch 'nadja' of https://github.com/lucifugus/idolum.git into
nadja