zaikousei reverted again. f*ing git
woke-up-in-middle-of-night-and-committed
Merge remote-tracking branch 'kalkov/develop' into develop
add images
Merge remote-tracking branch 'snowsunny/master' into develop
[fix] change language
Merge remote-tracking branch 'snowsunny/master' into develop
temp push for update
Merge remote-tracking branch 'tapalilov/develop' into develop
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'kagetsuki/master'
Merge remote-tracking branch 'kagetsuki/develop'
added missing rails-i18n require
Merge remote-tracking branch 'snowsunny/master' into develop
Merge remote-tracking branch 'absolu7/develop' into develop
Merge remote-tracking branch 'tapalilov/develop' into develop
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'tapalilov/develop' into develop
updated locales
forgot to add some translations