Merge remote-tracking branch 'upstream/develop' into develop

I hope there went nothing wrong with the merge...

Conflicts:
	.gitignore
	README
	app/controllers/application_controller.rb
	app/controllers/articles_controller.rb
	app/controllers/revisions_controller.rb
	app/controllers/user_sessions_controller.rb
	app/controllers/users_controller.rb
	app/models/article.rb
	app/models/comment.rb
	app/models/revision.rb
	app/models/user.rb
	app/models/wiki_session.rb
	app/views/articles/_form.html.erb
	app/views/articles/_form2.html.erb
	app/views/articles/show.html.erb
	app/views/layouts/_toolbar_header.html.erb
	app/views/layouts/application.html.erb
	app/views/revisions/diff.html.erb
	app/views/revisions/index.html.erb
	app/views/revisions/show.html.erb
	app/views/user_sessions/new.html.erb
	app/views/users/new.html.erb
	config/environment.rb
	config/environments/cucumber.rb
	config/environments/test.rb
	config/initializers/load_magmawiki_config.rb
	config/initializers/monkeypatches.rb
	config/initializers/wikicloth_init.rb
	config/routes.rb
	db/schema.rb
	features/step_definitions/user_steps/registration_steps.rb
	features/user_features/register.feature
	public/stylesheets/application.css
	public/stylesheets/forms.css
	spec/factories/user.rb
	spec/models/user_spec.rb
	spec/spec.opts
Make informal german version standard

The formal using of "you" is very rarely used in the internet
so I decided to drop support for the formal version first, and
concentrate on the informal version.

The formal version will be renewed in the future.
Finish german (informal) in yml-file
Fix typo in history.feature
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/views/layouts/application.html.erb
Finish translation to german of the yml-files.

Translation of layout and other view files have to wait until it is
sure if we use HAML or erb for the site
Merge branch 'feature/german' into develop
Merge remote-tracking branch 'upstream/develop' into develop
merged?
Merge branch 'develop' of https://github.com/locriani/magmawiki into develop

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/articles_controller.rb
	app/controllers/revisions_controller.rb
	app/models/article.rb
	app/models/comment.rb
	app/models/revision.rb
	app/models/user.rb
	app/models/wiki_session.rb
	app/views/articles/_form.html.erb
	app/views/articles/_form2.html.erb
	app/views/articles/show.html.erb
	app/views/layouts/_toolbar_header.html.erb
	app/views/layouts/application.html.erb
	app/views/revisions/diff.html.erb
	app/views/revisions/index.html.erb
	app/views/revisions/show.html.erb
	config/initializers/load_magmawiki_config.rb
	config/initializers/monkeypatches.rb
	config/initializers/wikicloth_init.rb
	config/locales/de.yml
	config/routes.rb
	db/schema.rb
	features/article_features/history.feature
	public/stylesheets/application.css
	public/stylesheets/forms.css
	spec/factories/user.rb
	spec/models/user_spec.rb
Merge branch 'develop' of https://github.com/locriani/magmawiki into develop

Conflicts:
	.gitignore
	app/models/article.rb
	app/views/layouts/application.html.erb

I really should stop working on develop directly :D
Converted ERB to HAML
Y did it change?
Made some validation tests pass

For the last not passing test, first a Factory for namespaces is needed.
Merge pull request #13 from NobbZ/feature/spec-clean

Cleaning up the specs