locally tested
cleaning up...
removing unused apps
cleaning up...
Merge pull request #10 from BeshoyLouka/major-bug-fixes

Major bug fixes