AgileVentures/WebsiteOne — pull request #49 by tochman (2014-01-20 06:50:54+00:00)
Title: 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)