Add gender self indification columns
Add gender identification to form
Add optional misc info field
Format errors for application
lookup static page templates locally
Merge branch 'master' of github.com:rails-girls-summer-of-code/rgsoc-teams
Minor refactor and speed up Travis
Merge pull request #92 from rails-girls-summer-of-code/speed-up-travis

Minor refactor and speed up Travis
Bump to Ruby 2.1.1
Merge branch 'master' of github.com:rails-girls-summer-of-code/rgsoc-teams

Conflicts:
	.travis.yml
Bump to Rails 4.1
Change README.md to mention Ruby 2.1.1 [ci skip]
Refactor routing specs
Add more routing specs
Add more routing specs
Refactor CalendarController
Merge branch 'master' into feature/add-gender-self-indentification-to-application

Conflicts:
	db/schema.rb
Merge branch 'feature/add-gender-self-indentification-to-application'

Fixes #86
Create Companies part. I
Create companies: remove show action and create views