ndomar/megasoft-13 — pull request #326 by georgesamy (2013-05-03 09:28:16+00:00)
Title: fixed conflicts head merge to master

@sshihata @Malatawy15 @ahmadsoliman
There was a mistake in Gemfile, fixed it. :wink: