Merge

Eh, lots again. Some new features, some tiny things. Some modules. Some needfull work for the SKO Card page.