Started work on new tooltip mixing
Started work on new tooltip mixing

Conflicts:
	app/backbone/views/activities/activity_item_view.coffee

daukantas/factlink-core,Factlink/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core