- style changes to app layout
- UI for one registration form
- added registration form basic mechanism and front-end wiring
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/bootstrap-overrides.css.scss
	config/onclick.yml
- progress on form changes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/layouts/application.html.haml
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
- basic framework for self-registration
- includes on-demand testpaper compilation
  for individual students
- minor reset issue with reg form
- fixed student pdf download link
- cosmetic and minor behavioral changes
- teacher registration and some UI changes
- teacher registration, the mailer
- mailer error, attempted fix
typo in logo
Merge branch 'master' of heroku.com:drona

Conflicts:
	app/models/student.rb
	app/views/students/inbox_echo.json.rabl
	db/schema.rb
	test/fixtures/students.yml
	test/unit/student_test.rb