added code of conduct
Merged develop