Merge remote-tracking branch 'remotes/kefahii/master'
enable local.php
Merge remote-tracking branch 'kefahii/master'
Merge Muayyad
Merge pull request #34 from ameen-sarsour/master

Merge with "enable local.php " #33