ATTENTION: asset dir / static uri optimizing
Merge remote-tracking branch 'origin/master'