merging master

app/models/user.rb

@@ -8,7 +8,7 @@ class User < ActiveRecord::Base
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me,
     :first_name, :last_name, :nickname, :bike_id,
-    :user_profiles_attributes
+    :user_profiles_attributes, :username
 
   has_many :transactions
   has_many :user_profiles
@@ -26,6 +26,10 @@ class User < ActiveRecord::Base
     "#{first_name} #{last_name}"
   end
 
+  def email_required?
+    false
+  end
+
   def full_name
     to_s
   end

app/models/user_profile.rb

@@ -1,16 +1,15 @@
 class UserProfile < ActiveRecord::Base
-  # Setup accessible (or protected) attributes for your model
   attr_accessible :user_id, :addrStreet1, :addrStreet2, :addrCity,
     :addrState, :addrZip, :phone
-  
+
   belongs_to :user
   belongs_to :bike
 
- #validates :addrStreet1 , :presence => true
- #validates :addrCity , :presence => true
- #validates :addrState , :presence => true
- #validates :addrZip , :presence => true
-  validates :phone, :presence => true
+  #validates :addrStreet1 , :presence => true
+  #validates :addrCity , :presence => true
+  #validates :addrState , :presence => true
+  #validates :addrZip , :presence => true
+  #validates :phone, :presence => true
 
   def to_s
     [addrStreet1, addrStreet2, addrCity, addrState, addrZip, phone].join(" - ")