Merge branch 'master' of github.com:willhall88/Angry-Kitty
added some partials for the event show
started creating participant and organiser views
removing header from modal on edit invitee
resend invitation email on edit details of invitee
addint required field on editing email of invitee
finished adding the drop down menu to the even view.tests still to fix
Merge branch 'will-bootstrap-2' of github.com:willhall88/Angry-Kitty into will-bootstrap-2
Merge branch 'master' of github.com:willhall88/Angry-Kitty
Merge branch 'master' into will-bootstrap-2
fixed merge issue in application.css
Merge branch 'will-bootstrap-2' of github.com:willhall88/Angry-Kitty into will-bootstrap-2
Added dropdown menu on event page and updated tests
added some css to the status buttons
added autofill when invitee accepts email link.
added the delete button to the event in a different place. and added chevrons for the drop down menus
Merge branch 'websteps' into will-bootstrap-2
Merge branch 'master' of github.com:willhall88/Angry-Kitty
Merge branch 'will-bootstrap-2'

Conflicts:
	app/views/events/show.html.erb
	features/step_definitions/email_invitation_steps.rb