Improved visual of show project, altered top page buttons
added icon
tasks

blub
fixed error
task model update
Merge remote-tracking branch 'origin/task' into develop
adapted admin user administration
a
various changes concerning project and user views
changes..
Added admin user within seeds
Merge branch 'features/admin-interface' into develop

Conflicts:
	app/models/category.rb
added favicon
implemented wysiwyg editor and datepicker
fix for heroku
task bugfix

routes now as resource
adapted tasks view, introduction of bids
Merge remote-tracking branch 'origin/task' into develop

Conflicts:
	app/views/projects/tasks/_index.html.erb
	app/views/projects/tasks/show.html.erb
	config/routes.rb
merge
merge