Added files from origin repository

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   README.md
	modified:   Rakefile
	new file:   app/assets/images/bg_fullsize001.jpg
	new file:   app/assets/images/dummies/schuelerforum_logo.jpg
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/html5shim.js
	new file:   app/assets/javascripts/obfuscate_emails.js.erb
	new file:   app/assets/javascripts/project.js.coffee
	modified:   app/assets/stylesheets/_fonts.css.sass
	modified:   app/assets/stylesheets/_mixins.css.sass
	modified:   app/assets/stylesheets/_variables.css.sass
	new file:   app/assets/stylesheets/adminnav.css.sass
	modified:   app/assets/stylesheets/backup/global.css.sass
	modified:   app/assets/stylesheets/bootstrap_and_overrides.css.sass
	new file:   app/assets/stylesheets/content.css.sass
	modified:   app/assets/stylesheets/global_styles.css.sass
	modified:   app/assets/stylesheets/header.css.sass
	modified:   app/assets/stylesheets/nav.css.sass
	new file:   app/assets/stylesheets/obfuscate_emails.css.sass
	new file:   app/assets/stylesheets/project.css.scss
	modified:   app/controllers/articles_controller.rb
	new file:   app/controllers/projects_controller.rb
	modified:   app/helpers/application_helper.rb
	new file:   app/helpers/projects_helper.rb
	modified:   app/models/page.rb
	new file:   app/models/project.rb
	new file:   app/models/pupil.rb
	new file:   app/models/school.rb
	new file:   app/models/teacher.rb
	modified:   app/models/user.rb
	modified:   app/views/articles/_article.html.haml
	modified:   app/views/layouts/_adminnav.html.haml
	modified:   app/views/layouts/_colors.html.haml
	new file:   app/views/layouts/_footer.html.haml
	modified:   app/views/layouts/_header.html.haml
	modified:   app/views/layouts/_metamenu.html.haml
	modified:   app/views/layouts/_nav.html.haml
	modified:   app/views/layouts/application.html.haml
	modified:   app/views/layouts/backup/_headmenu.html.haml
	modified:   app/views/pages/_aside_default.html.haml
	modified:   app/views/pages/show.html.haml
	modified:   app/views/pages/static/_default.html.haml
	new file:   app/views/pages/static/_zum-vdi-schuelerforum-anmelden.html.haml
	new file:   app/views/projects/_form.html.haml
	new file:   app/views/projects/_pupil_fields.html.haml
	new file:   app/views/projects/_school_fields.html.haml
	new file:   app/views/projects/_simple_form.html.haml
	new file:   app/views/projects/_teacher_fields.html.haml
	new file:   app/views/projects/new.html.haml
	new file:   app/views/projects/show.html.haml
	new file:   config/examples/application.yml
	new file:   config/locales/simple_form.de.yml
	modified:   config/routes.rb
	new file:   db/migrate/20121203184633_create_projects.rb
	new file:   db/migrate/20121203185904_create_schools.rb
	new file:   db/migrate/20121203190224_add_project_id_to_users.rb
	new file:   db/migrate/20121203194322_add_peronal_data_to_users.rb
	new file:   db/migrate/20121209160027_add_classname_to_users.rb
	new file:   db/migrate/20121217134123_add_country_to_schools.rb
	modified:   db/schema.rb
	modified:   spec/requests/pages_spec.rb
	new file:   spec/requests/projects_spec.rb
	modified:   spec/spec_helper.rb
brought back the cms toolbox
solved merge conflicts
brought back the footer