Modified events page, added user_id
Added Paperclip, Imagemagick, Images to Events
Merge branch 'calendar'

Conflicts:
	app/models/user.rb
	config/routes.rb
Merged the difference in files