Massive OpenKit-importer recode/upgrades
Merge branch 'development'