Yaros code

##### Fix for unmergeable PR's from Yaro

- Merged Yaros UserManagement and Avatar branches
- Merged with upstream develop (this NEEDS to be done before submitting ANY PR)
- Fix for css conflict with Mercury css (please be aware of this when implementing Mercury)