Research spike on front-end work
Merge branch 'master' into frontend_exploratory
Modularized layout and conditionalized sidebar for #251
Kirk changes
Merge branch 'master' into frontend_exploratory

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'frontend_exploratory' of github.com:FreeUKGen/MyopicVicar into frontend_exploratory

Conflicts:
	app/views/layouts/application.html.erb
Completed work on icons and layouts for #247
Merge branch 'master' into frontend_exploratory AND added fonts for #247

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'frontend_exploratory'

Conflicts:
	config/environments/development.rb