reset
Merge branch 'dev' of https://github.com/Akikonata/worldmeeting into dev