Merge branch 'makefile'

In addition to what the commit messages state, this merge updates the code to use latest SFML (2.3).

src/scenedit/scen.fileio.cpp

@@ -17,7 +17,7 @@
 #include "dlogutil.hpp"
 #include "tarball.hpp"
 #include "gzstream.h"
-#include "tinyprint.hpp"
+#include "tinyprint.h"
 #include "map_parse.hpp"
 
 #define	DONE_BUTTON_ITEM	1

src/scenedit/scen.menus.mac.mm

@@ -33,7 +33,7 @@ void init_menubar() {
 	inited = true;
 	
 	NSApplication* app = [NSApplication sharedApplication];
-	[NSBundle loadNibNamed: @"scen.menu" owner: app];
+	[NSBundle loadNibNamed: @"scenedit" owner: app];
 	menu_bar_handle = [app mainMenu];
 	
 	app_menu = [[menu_bar_handle itemWithTitle: @"BoE Scenario Editor"] submenu];