Merge branch 'aethyra/master'

Conflicts:
	src/beingmanager.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/label.cpp
	src/gui/label.h
	src/gui/popup.cpp
	src/gui/popup.h
	src/gui/scrollarea.cpp
	src/gui/skin.cpp
	src/gui/skin.h
	src/gui/speechbubble.cpp
	src/gui/window.cpp
	src/gui/window.h
	src/localplayer.h
	src/main.cpp
	src/net/ea/playerhandler.cpp
	src/resources/ambientoverlay.h
	src/resources/dye.cpp
	src/resources/imagewriter.cpp
	src/resources/itemdb.cpp
	src/shopitem.cpp

1 files changed, 2 insertions, 3 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 921ed75e..e143d506 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -409,7 +409,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
         color = &guiPalette->getColor(Palette::HIT_CRITICAL);
     }
     else if (!amount)
-     {
+    {
         if (attacker == player_node)
         {
             // This is intended to be the wrong direction to visually
@@ -1049,9 +1049,8 @@ void Being::load()
     int hairstyles = 1;
 
     while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml")
-    {
         hairstyles++;
-    }
+
     mNumberOfHairstyles = hairstyles;
 
     XML::Document doc(HAIR_FILE);