master #369

Closed
Haroon6138 wants to merge 9 commits from master into Main_App_Replacement