Merge branch 'master' of github.com:willhall88/Angry-Kitty
Merge branch 'master' of https://github.com/willhall88/Angry-Kitty
Merge branch 'master' of https://github.com/willhall88/Angry-Kitty into will-bootstrap-to-merge
Merge branch 'will-bootstrap-to-merge'
fixed all failing rspec tests- only one twilio test fails right now. two pending cucumber tests to sort. ALL GREEN.
cleaned up all the pending and remaining failed tests. ALL GREEN, twilio still failing
fixed rspec and percentage of paid method and fixed stats in progress bar, ALL GREEN, except twilio rspec
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
Merge branch 'will-bootstrap-2' of github.com:willhall88/Angry-Kitty into websteps
added event title validation and fixed all tests, twilio rspec still red, ALL GREEN
Added dropdown menu on event page and updated tests
added some css to the status buttons
Merge branch 'websteps' of github.com:willhall88/Angry-Kitty into websteps
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
fixed currency conversion across everything, changed receipt email and succesful payment message, ALL GREEN
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