First commit including update to skeletor profile
Merged changes to my local branch
Added avatar feild to User Profile and packaged it as a feature
make user_profile feature part of Unicorn Factory package
enable user_profile feature as part of Unicorn Factory package
Trying to recover from stashes
Second attempt at stash recovery
Removed cruft
Removed all the files that shouldn't have been there.
Fxing conflicts
Merge pull request #25 from Webcraft-Myplanet/UF-40

Uf 40
Such conflicts. Much fix. Wow.