Merge branch 'wiki'

db/migrate/20140529120536_add_wiki_to_thema.rb

@@ -0,0 +1,7 @@
+class AddWikiToThema < ActiveRecord::Migration
+  def change
+    add_column :themen, :wikiname, :string
+    add_column :themen, :wikiformat, :integer
+    add_column :themen, :hidelink, :boolea
+  end
+end

db/migrate/20140601114003_add_wiki_to_themengruppen.rb

@@ -0,0 +1,5 @@
+class AddWikiToThemengruppen < ActiveRecord::Migration
+  def change
+    add_column :themengruppen, :wiki_default, :boolean
+  end
+end