Merge pull request #337 from MGhanem/fix_master

Fix master
Merge pull request #338 from MGhanem/fix_master

fixed routes deleted by merge conflict
fixing routes
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into play
Merge pull request #339 from MGhanem/play

Play
fixed merge conflicts in admin theme
Converted bootstrap into a populate task
Removed faulty migration
Adds readme to repo