Switching back to Master Branch to work on Simplified app for Dubai Project