Finally refactored development to handle our platforms
Merge branch 'master' of github.com:FreeUKGen/MyopicVicar
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