Merge pull request #160 from Selectra-Dev/master

commit to staging
Merge pull request #162 from Selectra-Dev/master

account_url error staging
Localization debug
localisation cehck for city presentness
Merge pull request #168 from Selectra-Dev/master

update staging
Merge branch 'master' into staging
Add additional offers to student
Merge branch 'master' into staging
Merge branch '149-clickable-name' into staging
Add full_name to decorator
Merge branch '149-clickable-name'

Conflicts:
	app/decorators/admin/student_decorator.rb
Merge branch 'master' into staging
Add deliver to send mails
Merge pull request #169 from Selectra-Dev/169-no-mails

Mail confirmation cours de conduite
Add default week ability to schools
Merge pull request #118 from Selectra-Dev/118-code-exam-default-week

Définir comme semaine par défaut, horaires examens blancs de code
Add students for school admins
Add students history for admins
Merge pull request #172 from Selectra-Dev/172-appointment-history

Voir l'historique des élèves
Merge pull request #175 from Selectra-Dev/master

production