Squashed commit of the following:

commit f5c63f77c886dbac21c8607af65fc715c1751b77
Author: unknown <C:\Users\admin\AppData\Roaming\The Bat!>
Date:   Wed May 21 18:45:17 2014 +0300

    вывод галерей

commit fc56382b47ceac7a8b7ff92ff5a0c44ce056bc8b
Author: unknown <C:\Users\admin\AppData\Roaming\The Bat!>
Date:   Tue May 20 19:00:50 2014 +0300

    БД

commit a891ab648ac5f4697ae6b28688fd6fb059d1420c
Author: unknown <C:\Users\admin\AppData\Roaming\The Bat!>
Date:   Mon May 19 18:53:12 2014 +0300

    база

commit 36c8ebcfe3cc758d583304948653146cf1c22c89
Author: unknown <C:\Users\admin\AppData\Roaming\The Bat!>
Date:   Mon May 19 18:51:31 2014 +0300

    смена папки с картинками
ВИЗИВИГ. Страница 404
Merge branch 'master' of https://github.com/orthener/paniapteca

Conflicts:
	app/Controller/AppController.php
	app/Plugin/Admin/Controller/ImagesController.php
	app/Plugin/Admin/Controller/PostsController.php
	app/Plugin/Admin/View/Posts/edit.ctp