Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Add a pupil group and join table using scaffold
Add a pupil group and join table using scaffold
add the extra gender, ethnicity column to pupils
add discrete_area_of_development model
Add the pupil models validation tests and get them to pass
Pupil
still got .idea folder
Set up new models including a join table with pupil and group refs.
Correct the spelling mistakes leading to not null being missing from some columns
Render a multi selection box for putting pupils into groups when adding a new pupil
Render a multi selection box for putting pupils into groups when adding a new pupil
Be able to edit a pupils groups
Add the groups a pupil is in to the index page
Show name as full name and make it into a link to show
clean up routhes file
Routes
Add def upload to pupilcontroller
go away
Show name as full name and make it into a link to show