update gems
try to fix version of capybara to 2.0.2 to keep tests passing
Merge branch 'master' into develop
Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
edit test
help modals on the event form
update gems
stupid gemfile issues
removes num works limitation
update gems
stupid gemfile issues
that was not supposed to be commited yet...
total hours
good bye selenium, hello cucumber
Merge pull request #1 from elbartostrikesagain/home_page_total_hours

Home page total hours
Merge pull request #2 from elbartostrikesagain/develop

Develop