added paperclip user profile pic
tried using active_admin
added admin stuff
merge fixes