Merge branch 'master' into new-ui-stationview

Conflicts:
	src/ui/LuaContext.cpp
move bb ads out to Lua
display a message if the player doesn't have money to pay for repairs
round prices up, not down