merge alan
balik 28/8
Merge remote-tracking branch 'origin/dev' into alan