add image to user profile
fixing merge conflicts
trying to get the avatar working
Merge branch 'dev' of https://github.com/zpfled/schoolio into dev
image functionality
fixing conflicts