Merge branch 'master' of D:\web\iam.ge\iam.ge with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
blog  and core changed router.php