MGhanem/smartsoft-13 — pull request #343 by karimngr (2013-04-17 19:29:23+00:00)
Title: fixed merge conflicts in admin theme

@AmrARaouf @adamggg @m0hamed