Add view for administration
Fix administration
Merge branch 'beta' into category-administration-feature

Conflicts:
	app/controllers/categories_controller.rb
	app/views/layouts/_header.html.erb
	config/routes.rb
Fix merge conflict
Fix administration
Fix administration
Fix category administration
Merge branch 'beta' into category-administration-feature

Conflicts:
	app/views/layouts/_header.html.erb
	config/routes.rb
Fix merge conflicts
Fix locales for administration
Switch email fields to standard text fields
Fix Markdown specs
Update README
Add missing &callback parameter to unprocess_markdown_for
Skip creating index when exists
Update link to site
Move links to organization and site into configuration file
Update configuration example file
Show Labeling in Activity
Update translations for activities