Merge branch 'master' of github.com:qwars/city.qwars.loc

Conflicts:
	development/libs/lib12.yml