From 3d06565f10eca97242010c02d6505cd6ba3b36c0 Mon Sep 17 00:00:00 2001
From: BojanKverh <bojan.kverh@gmail.com>
Date: Thu, 11 Aug 2016 21:58:46 +0200
Subject: [PATCH] Merged develop into feature

--HG--
branch : feature