added stub files
fixing merge
merging in develop