merge master into jenkins

Fixed offLine state's disableProps() method and added errorToast for adding file formats which are not supported.