Merge branch 'master' into jgrpp

Hostile takeover feature

# Conflicts:
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/economy.cpp
#	src/script/api/script_event_types.cpp

src/company_base.h

@@ -181,6 +181,7 @@ struct Company : CompanyPool::PoolItem<&_company_pool>, CompanyProperties {
 
 Money CalculateCompanyValue(const Company *c, bool including_loan = true);
 Money CalculateCompanyValueExcludingShares(const Company *c, bool including_loan = true);
+Money CalculateHostileTakeoverValue(const Company *c);
 
 extern uint _cur_company_tick_index;