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

Conflicts:
	config/initializers/devise.rb

	modified:   ../.gitignore
	new file:   ../app/assets/javascripts/Gruntfile.js
	new file:   ../app/assets/javascripts/jquery.bgiframe.js
	new file:   ../app/assets/javascripts/jquery.cluetip.min.js
	new file:   ../app/assets/javascripts/jquery.compat.cluetip.js
	new file:   ../app/assets/javascripts/jquery.hoverIntent.js
	modified:   ../app/assets/javascripts/lcr_cluetip.js
	renamed:    ../app/assets/javascripts/lcr_cluetip.js -> ../app/assets/javascripts/lcr_cluetip.js~
	new file:   ../app/assets/javascripts/themeswitchertool.js
	new file:   ../app/assets/stylesheets/images/arrowdown.gif
	new file:   ../app/assets/stylesheets/images/arrowleft.gif
	new file:   ../app/assets/stylesheets/images/arrowright.gif
	new file:   ../app/assets/stylesheets/images/arrowup.gif
	new file:   ../app/assets/stylesheets/images/bl.gif
	new file:   ../app/assets/stylesheets/images/bl.png
	new file:   ../app/assets/stylesheets/images/br.gif
	new file:   ../app/assets/stylesheets/images/br.png
	new file:   ../app/assets/stylesheets/images/darrowdown.gif
	new file:   ../app/assets/stylesheets/images/darrowleft.gif
	new file:   ../app/assets/stylesheets/images/darrowright.gif
	new file:   ../app/assets/stylesheets/images/darrowup.gif
	new file:   ../app/assets/stylesheets/images/itunes.png
	new file:   ../app/assets/stylesheets/images/rarrowdown.gif
	new file:   ../app/assets/stylesheets/images/rarrowleft.gif
	new file:   ../app/assets/stylesheets/images/rarrowright.gif
	new file:   ../app/assets/stylesheets/images/rarrowup.gif
	new file:   ../app/assets/stylesheets/images/tl.gif
	new file:   ../app/assets/stylesheets/images/tl.png
	new file:   ../app/assets/stylesheets/images/tr.gif
	new file:   ../app/assets/stylesheets/images/tr.png
	new file:   ../app/assets/stylesheets/images/wait.gif
	new file:   ../app/assets/stylesheets/jquery.cluetip.css
	new file:   ../app/assets/stylesheets/jquery.compat.cluetip.css
	modified:   ../app/controllers/event_bewerbs_controller.rb
	modified:   ../app/controllers/fahr_auftrags_controller.rb
	modified:   ../app/controllers/grid_athleten_controller.rb
	modified:   ../app/controllers/grid_werner_controller.rb
	modified:   ../app/models/admin.rb
	modified:   ../app/models/athlet.rb
	modified:   ../app/models/event_meldung.rb
	modified:   ../app/views/athlets/_gluetip_show_meldung.html.erb
	modified:   ../app/views/event_bewerbs/index.html.erb
	modified:   ../app/views/event_bewerbs/show_index.html.erb
	modified:   ../app/views/event_meldungs/index.html.erb
	modified:   ../app/views/fahr_auftrags/_form.html.erb
	modified:   ../app/views/fahr_auftrags/edit.html.erb
	modified:   ../app/views/fahr_auftrags/index.html.erb
	modified:   ../app/views/grid_athleten/event_index.html.erb
	modified:   ../app/views/grid_meldungen/index.html.erb
	modified:   ../app/views/grid_werner/event_index.html.erb
	modified:   ../app/views/layouts/application.html.erb
	modified:   application.rb
	deleted:    deploy.rb.bak
	modified:   environments/production.rb~
	renamed:    initializers/devise.rb -> initializers/devise.rb~
203