Updates on server

	modified:   app/views/pages/pod12_17.html.erb
	modified:   app/views/pages/podzim2012.html.erb
Merge branch 'master' into production
Added Lukas Kripner into results

	modified:   app/views/pages/pod12_17.html.erb
Merge branch 'master' of https://github.com/gimlidc/den_cesty
Final results of DC

	modified:   app/views/pages/pod12_17.html.erb
	modified:   config/environments/development.rb
Merge remote branch 'origin/master' into production
Final results DC

	modified:   app/views/pages/pod12_17.html.erb
Added google analytics

	modified:   app/views/layouts/application.html.erb
Merge remote branch 'origin/master' into production
jaro 2013

	modified:   app/assets/stylesheets/page.css.scss
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/pages_controller.rb
	deleted:    app/views/pages/actual.html.erb
	modified:   app/views/pages/hall_of_glory.html.erb
	new file:   app/views/pages/jaro2013.html.erb
	modified:   app/views/registrations/new.html.erb
Merge remote branch 'origin/master' into production
Translation of rules, sponsors

	new file:   app/assets/images/logo-mapy.png
	new file:   app/assets/images/utmb.jpg
	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/pages_controller.rb
	modified:   app/views/devise/registrations/new.html.erb
	new file:   app/views/pages/commertial.html.erb
	modified:   app/views/pages/contacts.html.erb
	modified:   app/views/pages/jaro2013.html.erb
	new file:   app/views/pages/kontakty.html.erb
	renamed:    app/views/pages/rules.html.erb -> app/views/pages/pravidla.html.erb
	modified:   app/views/pages/rules.html.erb
	modified:   config/locales/cs.yml
	modified:   config/locales/en.yml
Styles for sponsors.

	modified:   app/assets/stylesheets/application.css
Merge remote branch 'origin/master' into production
Locale fix for rules and contacts

	modified:   app/controllers/pages_controller.rb
Merge remote branch 'origin/master' into production
Logo for Mapy.cz

	new file:   app/assets/images/Mapy-cz-s-r-o_logo.jpg
	modified:   app/views/pages/commertial.html.erb
Merge remote branch 'origin/master' into production
Fixed menu and content stripe

	modified:   .gitignore
	modified:   app/assets/stylesheets/application.css
	modified:   app/assets/stylesheets/page.css.scss
	modified:   app/assets/stylesheets/superfish.css
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/pages/jaro2013.html.erb
	modified:   db/schema.rb
Fixed account creation error messages