merged with yii-mata-app-template

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>