index view
Updates to dashboard
Changes to ticketdetail
Merge branch 'tags' of https://github.com/ivaldi/brimir into tags

Conflicts:
	app/views/tickets/show.html.erb
ticketdetail