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);