Merge remote-tracking branch 'origin/master'

assets/images/odd/0060a1.png

assets/images/odd/008cd5.png

assets/images/odd/00bae3.png

assets/images/odd/16ad38.png

assets/images/odd/1e446b.png

assets/images/odd/238846.png

assets/images/odd/39c134.png

assets/images/odd/ad0040.png

assets/images/odd/c08e23.png

assets/images/odd/d00022.png

assets/images/odd/dfac2b.png

assets/images/odd/eb0060.png

assets/images/odd/f4002f.png

assets/images/odd/f60015.png

assets/images/odd/fa5a0b.png

assets/images/odd/fc9b00.png

assets/images/odd/ffcb00.png

assets/images/odd/ffffff.png

assets/js/aap/aap.js

assets/js/admin/panel.js