update bird, lockers, tribal: short music times
Merge branch 'master' of https://github.com/kikko/devart-template

Conflicts:
	project_code/prod/app/src/coffee/m11s/lockers/settings.coffee