Add layout
merge
improve user model security
Added some layout
Merge branch 'Tho'

Conflicts:
	app/models/admin.rb
	app/models/buyer.rb
	app/models/seller.rb
	app/models/user.rb
remove default index html
merge
Merge
add gem ancestry to Gemfile
remove parent_id and add ancestry to category
change at category.rb