Deanpost,HomeSlider,Files Page, User Pictures, Admin Page Updates and all sorts of other stuff
Merge branch 'master' of https://github.com/johnjameswhitman/cocobolo

Conflicts:
	app/models/user.rb
	db/schema.rb
merging
adding lots of updates