Dev merged

Add all latest changes to live demo