Merge branch 'app_server'

Conflicts:
	src/kits/interface/PicturePlayer.cpp
	src/servers/app/ServerPicture.cpp

In addition, the following files were also adapted to master branch
BPicture changes during the merge:
	src/kits/interface/PicturePlayer.h
	src/servers/app/PictureBoundingBoxPlayer.cpp

headers/private/interface/PictureDataWriter.h

@@ -1,9 +1,10 @@
 /*
- * Copyright 2006-2007 Haiku, Inc. All rights reserved.
+ * Copyright 2006-2015 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Stefano Ceccherini, [email protected]
+ *		Julian Harnath, <[email protected]>
  */
 #ifndef _PICTURE_DATA_WRITER_H
 #define _PICTURE_DATA_WRITER_H
@@ -17,6 +18,7 @@
 #include <stack>
 
 
+class Layer;
 class BPositionIO;
 class BRegion;
 
@@ -93,6 +95,8 @@ public:
 			status_t			WriteDrawPicture(const BPoint& where,
 									const int32& token);
 
+			status_t			WriteBlendLayer(Layer* layer);
+
 protected:
 	// throw a status_t on error
 			void				BeginOp(const int16& op);

headers/private/interface/PicturePlayer.h

@@ -23,6 +23,7 @@ class BAffineTransform;
 class BList;
 class BPicture;
 class BShape;
+class Layer;
 
 
 namespace BPrivate {
@@ -83,6 +84,7 @@ struct picture_player_callbacks {
 	void (*set_blending_mode)(void* userData, source_alpha alphaSourceMode,
 		alpha_function alphaFunctionMode);
 	void (*set_transform)(void* userData, const BAffineTransform& transform);
+	void (*blend_layer)(void* userData, Layer* layer);
 };
 
 

headers/private/interface/PictureProtocol.h

@@ -52,10 +52,11 @@ enum {
 	B_PIC_SET_FONT_BPP			= 0x0388,
 	B_PIC_SET_FONT_FACE			= 0x0389,
 	B_PIC_SET_TRANSFORM			= 0x0390,
+	B_PIC_BLEND_LAYER			= 0x0391
 };
 
 
-const static uint32 kOpsTableSize = 49;
+const static uint32 kOpsTableSize = 50;
 
 
 #endif