Merge origin/master

Conflicts:
	src/java/bi/media_plan.java
Merge origin/master