Reordering
Technology update
Merge branch 'master' of https://github.com/paazmaya/naginata.fi