13.03
13.03
Merge branch 'master' of https://github.com/fjseiwert/LCR

Conflicts:
	app/views/devise/registrations/new.html.erb