Added profile and auction tab to user
Merge branch 'profile_auction_tab'

Conflicts:
	db/schema.rb