Edited the Simulator
Edited the Simulator & added AppTypeSelection.jsp
Merge remote-tracking branch 'origin/master'