186 files changed, 6 insertions, 6 deletions

diff --git a/inc/functions.php b/inc/functions.php
index 80b85a4e..ba911146 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -6,7 +6,7 @@
 	}
 	
 	require 'inc/events.php';
-	require 'contrib/gettext/gettext.inc';
+	require 'lib/gettext/gettext.inc';
 	
 	register_shutdown_function('fatal_error_handler');
 	mb_internal_encoding('UTF-8');
@@ -156,7 +156,7 @@
 			openlog('tinyboard', LOG_ODELAY, LOG_SYSLOG); // open a connection to sysem logger
 		
 		if($config['recaptcha'])
-			require_once 'inc/contrib/recaptcha/recaptchalib.php';
+			require_once 'inc/lib/recaptcha/recaptchalib.php';
 		if($config['cache']['enabled'])
 			require_once 'inc/cache.php';
 	}
@@ -1334,7 +1334,7 @@
 		}
 		
 		if($config['minify_js']) {
-			require_once 'inc/contrib/minify/JSMin.php';		
+			require_once 'inc/lib/minify/JSMin.php';		
 			$script = JSMin::minify($script);
 		}
 		
diff --git a/inc/contrib/Twig/Autoloader.php b/inc/lib/Twig/Autoloader.php
index a93b8caf..a93b8caf 100644
--- a/inc/contrib/Twig/Autoloader.php
+++ b/inc/lib/Twig/Autoloader.php
diff --git a/inc/contrib/Twig/Compiler.php b/inc/lib/Twig/Compiler.php
index db2e8de4..db2e8de4 100644
--- a/inc/contrib/Twig/Compiler.php
+++ b/inc/lib/Twig/Compiler.php
diff --git a/inc/contrib/Twig/CompilerInterface.php b/inc/lib/Twig/CompilerInterface.php
index 0a13edf2..0a13edf2 100644
--- a/inc/contrib/Twig/CompilerInterface.php
+++ b/inc/lib/Twig/CompilerInterface.php
diff --git a/inc/contrib/Twig/Environment.php b/inc/lib/Twig/Environment.php
index b91c80c5..b91c80c5 100644
--- a/inc/contrib/Twig/Environment.php
+++ b/inc/lib/Twig/Environment.php
diff --git a/inc/contrib/Twig/Error.php b/inc/lib/Twig/Error.php
index ed0836c4..ed0836c4 100644
--- a/inc/contrib/Twig/Error.php
+++ b/inc/lib/Twig/Error.php
diff --git a/inc/contrib/Twig/Error/Loader.php b/inc/lib/Twig/Error/Loader.php
index 418a7760..418a7760 100644
--- a/inc/contrib/Twig/Error/Loader.php
+++ b/inc/lib/Twig/Error/Loader.php
diff --git a/inc/contrib/Twig/Error/Runtime.php b/inc/lib/Twig/Error/Runtime.php
index 8a387fa8..8a387fa8 100644
--- a/inc/contrib/Twig/Error/Runtime.php
+++ b/inc/lib/Twig/Error/Runtime.php
diff --git a/inc/contrib/Twig/Error/Syntax.php b/inc/lib/Twig/Error/Syntax.php
index a2650c36..a2650c36 100644
--- a/inc/contrib/Twig/Error/Syntax.php
+++ b/inc/lib/Twig/Error/Syntax.php
diff --git a/inc/contrib/Twig/ExpressionParser.php b/inc/lib/Twig/ExpressionParser.php
index b4fc5d5d..b4fc5d5d 100644
--- a/inc/contrib/Twig/ExpressionParser.php
+++ b/inc/lib/Twig/ExpressionParser.php
diff --git a/inc/contrib/Twig/Extension.php b/inc/lib/Twig/Extension.php
index ac289cb4..ac289cb4 100644
--- a/inc/contrib/Twig/Extension.php
+++ b/inc/lib/Twig/Extension.php
diff --git a/inc/contrib/Twig/Extension/Core.php b/inc/lib/Twig/Extension/Core.php
index a4153245..a4153245 100644
--- a/inc/contrib/Twig/Extension/Core.php
+++ b/inc/lib/Twig/Extension/Core.php
diff --git a/inc/contrib/Twig/Extension/Escaper.php b/inc/lib/Twig/Extension/Escaper.php
index 43ae1113..43ae1113 100644
--- a/inc/contrib/Twig/Extension/Escaper.php
+++ b/inc/lib/Twig/Extension/Escaper.php
diff --git a/inc/contrib/Twig/Extension/Optimizer.php b/inc/lib/Twig/Extension/Optimizer.php
index 013fcb62..013fcb62 100644
--- a/inc/contrib/Twig/Extension/Optimizer.php
+++ b/inc/lib/Twig/Extension/Optimizer.php
diff --git a/inc/contrib/Twig/Extension/Sandbox.php b/inc/lib/Twig/Extension/Sandbox.php
index bf76c11a..bf76c11a 100644
--- a/inc/contrib/Twig/Extension/Sandbox.php
+++ b/inc/lib/Twig/Extension/Sandbox.php
diff --git a/inc/contrib/Twig/ExtensionInterface.php b/inc/lib/Twig/ExtensionInterface.php
index f8b232a5..f8b232a5 100644
--- a/inc/contrib/Twig/ExtensionInterface.php
+++ b/inc/lib/Twig/ExtensionInterface.php
diff --git a/inc/contrib/Twig/Extensions/Extension/I18n.php b/inc/lib/Twig/Extensions/Extension/I18n.php
index 1f795490..1f795490 100644
--- a/inc/contrib/Twig/Extensions/Extension/I18n.php
+++ b/inc/lib/Twig/Extensions/Extension/I18n.php
diff --git a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
index 0cf7705a..0cf7705a 100644
--- a/inc/contrib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/Extensions/Extension/Tinyboard.php
diff --git a/inc/contrib/Twig/Extensions/Node/Trans.php b/inc/lib/Twig/Extensions/Node/Trans.php
index 18087e77..18087e77 100644
--- a/inc/contrib/Twig/Extensions/Node/Trans.php
+++ b/inc/lib/Twig/Extensions/Node/Trans.php
diff --git a/inc/contrib/Twig/Extensions/TokenParser/Trans.php b/inc/lib/Twig/Extensions/TokenParser/Trans.php
index 5b2d93b6..5b2d93b6 100644
--- a/inc/contrib/Twig/Extensions/TokenParser/Trans.php
+++ b/inc/lib/Twig/Extensions/TokenParser/Trans.php
diff --git a/inc/contrib/Twig/Filter.php b/inc/lib/Twig/Filter.php
index 9595a1a8..9595a1a8 100644
--- a/inc/contrib/Twig/Filter.php
+++ b/inc/lib/Twig/Filter.php
diff --git a/inc/contrib/Twig/Filter/Function.php b/inc/lib/Twig/Filter/Function.php
index 1de078b2..1de078b2 100644
--- a/inc/contrib/Twig/Filter/Function.php
+++ b/inc/lib/Twig/Filter/Function.php
diff --git a/inc/contrib/Twig/Filter/Method.php b/inc/lib/Twig/Filter/Method.php
index d831e0f2..d831e0f2 100644
--- a/inc/contrib/Twig/Filter/Method.php
+++ b/inc/lib/Twig/Filter/Method.php
diff --git a/inc/contrib/Twig/FilterInterface.php b/inc/lib/Twig/FilterInterface.php
index 4ac19ceb..4ac19ceb 100644
--- a/inc/contrib/Twig/FilterInterface.php
+++ b/inc/lib/Twig/FilterInterface.php
diff --git a/inc/contrib/Twig/Function.php b/inc/lib/Twig/Function.php
index 1197924a..1197924a 100644
--- a/inc/contrib/Twig/Function.php
+++ b/inc/lib/Twig/Function.php
diff --git a/inc/contrib/Twig/Function/Function.php b/inc/lib/Twig/Function/Function.php
index 3237d8c5..3237d8c5 100644
--- a/inc/contrib/Twig/Function/Function.php
+++ b/inc/lib/Twig/Function/Function.php
diff --git a/inc/contrib/Twig/Function/Method.php b/inc/lib/Twig/Function/Method.php
index 7328566e..7328566e 100644
--- a/inc/contrib/Twig/Function/Method.php
+++ b/inc/lib/Twig/Function/Method.php
diff --git a/inc/contrib/Twig/FunctionInterface.php b/inc/lib/Twig/FunctionInterface.php
index ccc9fd93..ccc9fd93 100644
--- a/inc/contrib/Twig/FunctionInterface.php
+++ b/inc/lib/Twig/FunctionInterface.php
diff --git a/inc/contrib/Twig/Lexer.php b/inc/lib/Twig/Lexer.php
index 868a814e..868a814e 100644
--- a/inc/contrib/Twig/Lexer.php
+++ b/inc/lib/Twig/Lexer.php
diff --git a/inc/contrib/Twig/LexerInterface.php b/inc/lib/Twig/LexerInterface.php
index 02233849..02233849 100644
--- a/inc/contrib/Twig/LexerInterface.php
+++ b/inc/lib/Twig/LexerInterface.php
diff --git a/inc/contrib/Twig/Loader/Array.php b/inc/lib/Twig/Loader/Array.php
index e8dc1605..e8dc1605 100644
--- a/inc/contrib/Twig/Loader/Array.php
+++ b/inc/lib/Twig/Loader/Array.php
diff --git a/inc/contrib/Twig/Loader/Chain.php b/inc/lib/Twig/Loader/Chain.php
index 48dd8b84..48dd8b84 100644
--- a/inc/contrib/Twig/Loader/Chain.php
+++ b/inc/lib/Twig/Loader/Chain.php
diff --git a/inc/contrib/Twig/Loader/Filesystem.php b/inc/lib/Twig/Loader/Filesystem.php
index be348aa3..be348aa3 100644
--- a/inc/contrib/Twig/Loader/Filesystem.php
+++ b/inc/lib/Twig/Loader/Filesystem.php
diff --git a/inc/contrib/Twig/Loader/String.php b/inc/lib/Twig/Loader/String.php
index 26eb0096..26eb0096 100644
--- a/inc/contrib/Twig/Loader/String.php
+++ b/inc/lib/Twig/Loader/String.php
diff --git a/inc/contrib/Twig/LoaderInterface.php b/inc/lib/Twig/LoaderInterface.php
index f0bd3a5b..f0bd3a5b 100644
--- a/inc/contrib/Twig/LoaderInterface.php
+++ b/inc/lib/Twig/LoaderInterface.php
diff --git a/inc/contrib/Twig/Markup.php b/inc/lib/Twig/Markup.php
index c1a1469c..c1a1469c 100644
--- a/inc/contrib/Twig/Markup.php
+++ b/inc/lib/Twig/Markup.php
diff --git a/inc/contrib/Twig/Node.php b/inc/lib/Twig/Node.php
index 22e65d45..22e65d45 100644
--- a/inc/contrib/Twig/Node.php
+++ b/inc/lib/Twig/Node.php
diff --git a/inc/contrib/Twig/Node/AutoEscape.php b/inc/lib/Twig/Node/AutoEscape.php
index a0c2ee6d..a0c2ee6d 100644
--- a/inc/contrib/Twig/Node/AutoEscape.php
+++ b/inc/lib/Twig/Node/AutoEscape.php
diff --git a/inc/contrib/Twig/Node/Block.php b/inc/lib/Twig/Node/Block.php
index 5548ad06..5548ad06 100644
--- a/inc/contrib/Twig/Node/Block.php
+++ b/inc/lib/Twig/Node/Block.php
diff --git a/inc/contrib/Twig/Node/BlockReference.php b/inc/lib/Twig/Node/BlockReference.php
index 53f6287c..53f6287c 100644
--- a/inc/contrib/Twig/Node/BlockReference.php
+++ b/inc/lib/Twig/Node/BlockReference.php
diff --git a/inc/contrib/Twig/Node/Expression.php b/inc/lib/Twig/Node/Expression.php
index 13b170e5..13b170e5 100644
--- a/inc/contrib/Twig/Node/Expression.php
+++ b/inc/lib/Twig/Node/Expression.php
diff --git a/inc/contrib/Twig/Node/Expression/Array.php b/inc/lib/Twig/Node/Expression/Array.php
index 2d860823..2d860823 100644
--- a/inc/contrib/Twig/Node/Expression/Array.php
+++ b/inc/lib/Twig/Node/Expression/Array.php
diff --git a/inc/contrib/Twig/Node/Expression/AssignName.php b/inc/lib/Twig/Node/Expression/AssignName.php
index 67f12509..67f12509 100644
--- a/inc/contrib/Twig/Node/Expression/AssignName.php
+++ b/inc/lib/Twig/Node/Expression/AssignName.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary.php b/inc/lib/Twig/Node/Expression/Binary.php
index 9dd5de2c..9dd5de2c 100644
--- a/inc/contrib/Twig/Node/Expression/Binary.php
+++ b/inc/lib/Twig/Node/Expression/Binary.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Add.php b/inc/lib/Twig/Node/Expression/Binary/Add.php
index 0ef8e117..0ef8e117 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Add.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Add.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/And.php b/inc/lib/Twig/Node/Expression/Binary/And.php
index d5752ebb..d5752ebb 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/And.php
+++ b/inc/lib/Twig/Node/Expression/Binary/And.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
index 9a46d845..9a46d845 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ b/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php
index 058a20bf..058a20bf 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ b/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php
index f4da73d4..f4da73d4 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ b/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Concat.php b/inc/lib/Twig/Node/Expression/Binary/Concat.php
index f9a64627..f9a64627 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Concat.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Concat.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Div.php b/inc/lib/Twig/Node/Expression/Binary/Div.php
index e0797a61..e0797a61 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Div.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Div.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Equal.php b/inc/lib/Twig/Node/Expression/Binary/Equal.php
index 7b1236d0..7b1236d0 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Equal.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Equal.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php b/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php
index e86b1ea0..e86b1ea0 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/FloorDiv.php
+++ b/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Greater.php b/inc/lib/Twig/Node/Expression/Binary/Greater.php
index a110bd92..a110bd92 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Greater.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Greater.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php b/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php
index 3754fed2..3754fed2 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ b/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/In.php b/inc/lib/Twig/Node/Expression/Binary/In.php
index 788f9377..788f9377 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/In.php
+++ b/inc/lib/Twig/Node/Expression/Binary/In.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Less.php b/inc/lib/Twig/Node/Expression/Binary/Less.php
index 45fd3004..45fd3004 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Less.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Less.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php b/inc/lib/Twig/Node/Expression/Binary/LessEqual.php
index e38e257c..e38e257c 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/LessEqual.php
+++ b/inc/lib/Twig/Node/Expression/Binary/LessEqual.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mod.php b/inc/lib/Twig/Node/Expression/Binary/Mod.php
index 9924114f..9924114f 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Mod.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Mod.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Mul.php b/inc/lib/Twig/Node/Expression/Binary/Mul.php
index c91529ca..c91529ca 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Mul.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Mul.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php b/inc/lib/Twig/Node/Expression/Binary/NotEqual.php
index 26867ba2..26867ba2 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/NotEqual.php
+++ b/inc/lib/Twig/Node/Expression/Binary/NotEqual.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/NotIn.php b/inc/lib/Twig/Node/Expression/Binary/NotIn.php
index f347b7b6..f347b7b6 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/NotIn.php
+++ b/inc/lib/Twig/Node/Expression/Binary/NotIn.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Or.php b/inc/lib/Twig/Node/Expression/Binary/Or.php
index adba49c6..adba49c6 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Or.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Or.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Power.php b/inc/lib/Twig/Node/Expression/Binary/Power.php
index b2c59040..b2c59040 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Power.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Power.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Range.php b/inc/lib/Twig/Node/Expression/Binary/Range.php
index bea4f2a6..bea4f2a6 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Range.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Range.php
diff --git a/inc/contrib/Twig/Node/Expression/Binary/Sub.php b/inc/lib/Twig/Node/Expression/Binary/Sub.php
index d4463991..d4463991 100644
--- a/inc/contrib/Twig/Node/Expression/Binary/Sub.php
+++ b/inc/lib/Twig/Node/Expression/Binary/Sub.php
diff --git a/inc/contrib/Twig/Node/Expression/BlockReference.php b/inc/lib/Twig/Node/Expression/BlockReference.php
index 174d9097..174d9097 100644
--- a/inc/contrib/Twig/Node/Expression/BlockReference.php
+++ b/inc/lib/Twig/Node/Expression/BlockReference.php
diff --git a/inc/contrib/Twig/Node/Expression/Conditional.php b/inc/lib/Twig/Node/Expression/Conditional.php
index edcb1e2d..edcb1e2d 100644
--- a/inc/contrib/Twig/Node/Expression/Conditional.php
+++ b/inc/lib/Twig/Node/Expression/Conditional.php
diff --git a/inc/contrib/Twig/Node/Expression/Constant.php b/inc/lib/Twig/Node/Expression/Constant.php
index a91dc698..a91dc698 100644
--- a/inc/contrib/Twig/Node/Expression/Constant.php
+++ b/inc/lib/Twig/Node/Expression/Constant.php
diff --git a/inc/contrib/Twig/Node/Expression/ExtensionReference.php b/inc/lib/Twig/Node/Expression/ExtensionReference.php
index cb4efad0..cb4efad0 100644
--- a/inc/contrib/Twig/Node/Expression/ExtensionReference.php
+++ b/inc/lib/Twig/Node/Expression/ExtensionReference.php
diff --git a/inc/contrib/Twig/Node/Expression/Filter.php b/inc/lib/Twig/Node/Expression/Filter.php
index 101e6df0..101e6df0 100644
--- a/inc/contrib/Twig/Node/Expression/Filter.php
+++ b/inc/lib/Twig/Node/Expression/Filter.php
diff --git a/inc/contrib/Twig/Node/Expression/Function.php b/inc/lib/Twig/Node/Expression/Function.php
index 3f457199..3f457199 100644
--- a/inc/contrib/Twig/Node/Expression/Function.php
+++ b/inc/lib/Twig/Node/Expression/Function.php
diff --git a/inc/contrib/Twig/Node/Expression/GetAttr.php b/inc/lib/Twig/Node/Expression/GetAttr.php
index eb9e6050..eb9e6050 100644
--- a/inc/contrib/Twig/Node/Expression/GetAttr.php
+++ b/inc/lib/Twig/Node/Expression/GetAttr.php
diff --git a/inc/contrib/Twig/Node/Expression/Name.php b/inc/lib/Twig/Node/Expression/Name.php
index fceda2b7..fceda2b7 100644
--- a/inc/contrib/Twig/Node/Expression/Name.php
+++ b/inc/lib/Twig/Node/Expression/Name.php
diff --git a/inc/contrib/Twig/Node/Expression/Parent.php b/inc/lib/Twig/Node/Expression/Parent.php
index 5689fe45..5689fe45 100644
--- a/inc/contrib/Twig/Node/Expression/Parent.php
+++ b/inc/lib/Twig/Node/Expression/Parent.php
diff --git a/inc/contrib/Twig/Node/Expression/Test.php b/inc/lib/Twig/Node/Expression/Test.php
index ef35df6b..ef35df6b 100644
--- a/inc/contrib/Twig/Node/Expression/Test.php
+++ b/inc/lib/Twig/Node/Expression/Test.php
diff --git a/inc/contrib/Twig/Node/Expression/Unary.php b/inc/lib/Twig/Node/Expression/Unary.php
index c514388e..c514388e 100644
--- a/inc/contrib/Twig/Node/Expression/Unary.php
+++ b/inc/lib/Twig/Node/Expression/Unary.php
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Neg.php b/inc/lib/Twig/Node/Expression/Unary/Neg.php
index 2a3937ec..2a3937ec 100644
--- a/inc/contrib/Twig/Node/Expression/Unary/Neg.php
+++ b/inc/lib/Twig/Node/Expression/Unary/Neg.php
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Not.php b/inc/lib/Twig/Node/Expression/Unary/Not.php
index f94073cf..f94073cf 100644
--- a/inc/contrib/Twig/Node/Expression/Unary/Not.php
+++ b/inc/lib/Twig/Node/Expression/Unary/Not.php
diff --git a/inc/contrib/Twig/Node/Expression/Unary/Pos.php b/inc/lib/Twig/Node/Expression/Unary/Pos.php
index 04edb52a..04edb52a 100644
--- a/inc/contrib/Twig/Node/Expression/Unary/Pos.php
+++ b/inc/lib/Twig/Node/Expression/Unary/Pos.php
diff --git a/inc/contrib/Twig/Node/For.php b/inc/lib/Twig/Node/For.php
index eb204e28..eb204e28 100644
--- a/inc/contrib/Twig/Node/For.php
+++ b/inc/lib/Twig/Node/For.php
diff --git a/inc/contrib/Twig/Node/If.php b/inc/lib/Twig/Node/If.php
index aa12efbe..aa12efbe 100644
--- a/inc/contrib/Twig/Node/If.php
+++ b/inc/lib/Twig/Node/If.php
diff --git a/inc/contrib/Twig/Node/Import.php b/inc/lib/Twig/Node/Import.php
index a327411d..a327411d 100644
--- a/inc/contrib/Twig/Node/Import.php
+++ b/inc/lib/Twig/Node/Import.php
diff --git a/inc/contrib/Twig/Node/Include.php b/inc/lib/Twig/Node/Include.php
index 467749b5..467749b5 100644
--- a/inc/contrib/Twig/Node/Include.php
+++ b/inc/lib/Twig/Node/Include.php
diff --git a/inc/contrib/Twig/Node/Macro.php b/inc/lib/Twig/Node/Macro.php
index 9f95570f..9f95570f 100644
--- a/inc/contrib/Twig/Node/Macro.php
+++ b/inc/lib/Twig/Node/Macro.php
diff --git a/inc/contrib/Twig/Node/Module.php b/inc/lib/Twig/Node/Module.php
index 9b8c55e3..9b8c55e3 100644
--- a/inc/contrib/Twig/Node/Module.php
+++ b/inc/lib/Twig/Node/Module.php
diff --git a/inc/contrib/Twig/Node/Print.php b/inc/lib/Twig/Node/Print.php
index 766725ff..766725ff 100644
--- a/inc/contrib/Twig/Node/Print.php
+++ b/inc/lib/Twig/Node/Print.php
diff --git a/inc/contrib/Twig/Node/Sandbox.php b/inc/lib/Twig/Node/Sandbox.php
index cbfcb411..cbfcb411 100644
--- a/inc/contrib/Twig/Node/Sandbox.php
+++ b/inc/lib/Twig/Node/Sandbox.php
diff --git a/inc/contrib/Twig/Node/SandboxedModule.php b/inc/lib/Twig/Node/SandboxedModule.php
index 36d9f198..36d9f198 100644
--- a/inc/contrib/Twig/Node/SandboxedModule.php
+++ b/inc/lib/Twig/Node/SandboxedModule.php
diff --git a/inc/contrib/Twig/Node/SandboxedPrint.php b/inc/lib/Twig/Node/SandboxedPrint.php
index 77730d8c..77730d8c 100644
--- a/inc/contrib/Twig/Node/SandboxedPrint.php
+++ b/inc/lib/Twig/Node/SandboxedPrint.php
diff --git a/inc/contrib/Twig/Node/Set.php b/inc/lib/Twig/Node/Set.php
index 9913664f..9913664f 100644
--- a/inc/contrib/Twig/Node/Set.php
+++ b/inc/lib/Twig/Node/Set.php
diff --git a/inc/contrib/Twig/Node/Spaceless.php b/inc/lib/Twig/Node/Spaceless.php
index 46013466..46013466 100644
--- a/inc/contrib/Twig/Node/Spaceless.php
+++ b/inc/lib/Twig/Node/Spaceless.php
diff --git a/inc/contrib/Twig/Node/Text.php b/inc/lib/Twig/Node/Text.php
index 0c1c0928..0c1c0928 100644
--- a/inc/contrib/Twig/Node/Text.php
+++ b/inc/lib/Twig/Node/Text.php
diff --git a/inc/contrib/Twig/NodeInterface.php b/inc/lib/Twig/NodeInterface.php
index 165aed4d..165aed4d 100644
--- a/inc/contrib/Twig/NodeInterface.php
+++ b/inc/lib/Twig/NodeInterface.php
diff --git a/inc/contrib/Twig/NodeOutputInterface.php b/inc/lib/Twig/NodeOutputInterface.php
index 71839569..71839569 100644
--- a/inc/contrib/Twig/NodeOutputInterface.php
+++ b/inc/lib/Twig/NodeOutputInterface.php
diff --git a/inc/contrib/Twig/NodeTraverser.php b/inc/lib/Twig/NodeTraverser.php
index 1e82b032..1e82b032 100644
--- a/inc/contrib/Twig/NodeTraverser.php
+++ b/inc/lib/Twig/NodeTraverser.php
diff --git a/inc/contrib/Twig/NodeVisitor/Escaper.php b/inc/lib/Twig/NodeVisitor/Escaper.php
index 049ce96a..049ce96a 100644
--- a/inc/contrib/Twig/NodeVisitor/Escaper.php
+++ b/inc/lib/Twig/NodeVisitor/Escaper.php
diff --git a/inc/contrib/Twig/NodeVisitor/Optimizer.php b/inc/lib/Twig/NodeVisitor/Optimizer.php
index 3679746e..3679746e 100644
--- a/inc/contrib/Twig/NodeVisitor/Optimizer.php
+++ b/inc/lib/Twig/NodeVisitor/Optimizer.php
diff --git a/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
index 5961ba29..5961ba29 100644
--- a/inc/contrib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
diff --git a/inc/contrib/Twig/NodeVisitor/Sandbox.php b/inc/lib/Twig/NodeVisitor/Sandbox.php
index 356b661f..356b661f 100644
--- a/inc/contrib/Twig/NodeVisitor/Sandbox.php
+++ b/inc/lib/Twig/NodeVisitor/Sandbox.php
diff --git a/inc/contrib/Twig/NodeVisitorInterface.php b/inc/lib/Twig/NodeVisitorInterface.php
index d44e510c..d44e510c 100644
--- a/inc/contrib/Twig/NodeVisitorInterface.php
+++ b/inc/lib/Twig/NodeVisitorInterface.php
diff --git a/inc/contrib/Twig/Parser.php b/inc/lib/Twig/Parser.php
index 8c982887..8c982887 100644
--- a/inc/contrib/Twig/Parser.php
+++ b/inc/lib/Twig/Parser.php
diff --git a/inc/contrib/Twig/ParserInterface.php b/inc/lib/Twig/ParserInterface.php
index c7a34418..c7a34418 100644
--- a/inc/contrib/Twig/ParserInterface.php
+++ b/inc/lib/Twig/ParserInterface.php
diff --git a/inc/contrib/Twig/Sandbox/SecurityError.php b/inc/lib/Twig/Sandbox/SecurityError.php
index debabb79..debabb79 100644
--- a/inc/contrib/Twig/Sandbox/SecurityError.php
+++ b/inc/lib/Twig/Sandbox/SecurityError.php
diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicy.php b/inc/lib/Twig/Sandbox/SecurityPolicy.php
index ba912ef4..ba912ef4 100644
--- a/inc/contrib/Twig/Sandbox/SecurityPolicy.php
+++ b/inc/lib/Twig/Sandbox/SecurityPolicy.php
diff --git a/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php b/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php
index d5015aff..d5015aff 100644
--- a/inc/contrib/Twig/Sandbox/SecurityPolicyInterface.php
+++ b/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php
diff --git a/inc/contrib/Twig/Template.php b/inc/lib/Twig/Template.php
index a129fd73..a129fd73 100644
--- a/inc/contrib/Twig/Template.php
+++ b/inc/lib/Twig/Template.php
diff --git a/inc/contrib/Twig/TemplateInterface.php b/inc/lib/Twig/TemplateInterface.php
index 08da1163..08da1163 100644
--- a/inc/contrib/Twig/TemplateInterface.php
+++ b/inc/lib/Twig/TemplateInterface.php
diff --git a/inc/contrib/Twig/Test/Function.php b/inc/lib/Twig/Test/Function.php
index 1240a0f1..1240a0f1 100644
--- a/inc/contrib/Twig/Test/Function.php
+++ b/inc/lib/Twig/Test/Function.php
diff --git a/inc/contrib/Twig/Test/Method.php b/inc/lib/Twig/Test/Method.php
index a3b39483..a3b39483 100644
--- a/inc/contrib/Twig/Test/Method.php
+++ b/inc/lib/Twig/Test/Method.php
diff --git a/inc/contrib/Twig/TestInterface.php b/inc/lib/Twig/TestInterface.php
index c2ff7258..c2ff7258 100644
--- a/inc/contrib/Twig/TestInterface.php
+++ b/inc/lib/Twig/TestInterface.php
diff --git a/inc/contrib/Twig/Token.php b/inc/lib/Twig/Token.php
index 79a10030..79a10030 100644
--- a/inc/contrib/Twig/Token.php
+++ b/inc/lib/Twig/Token.php
diff --git a/inc/contrib/Twig/TokenParser.php b/inc/lib/Twig/TokenParser.php
index 6c9e6935..6c9e6935 100644
--- a/inc/contrib/Twig/TokenParser.php
+++ b/inc/lib/Twig/TokenParser.php
diff --git a/inc/contrib/Twig/TokenParser/AutoEscape.php b/inc/lib/Twig/TokenParser/AutoEscape.php
index 3b4b96e3..3b4b96e3 100644
--- a/inc/contrib/Twig/TokenParser/AutoEscape.php
+++ b/inc/lib/Twig/TokenParser/AutoEscape.php
diff --git a/inc/contrib/Twig/TokenParser/Block.php b/inc/lib/Twig/TokenParser/Block.php
index b31f7ed6..b31f7ed6 100644
--- a/inc/contrib/Twig/TokenParser/Block.php
+++ b/inc/lib/Twig/TokenParser/Block.php
diff --git a/inc/contrib/Twig/TokenParser/Extends.php b/inc/lib/Twig/TokenParser/Extends.php
index 67eacda0..67eacda0 100644
--- a/inc/contrib/Twig/TokenParser/Extends.php
+++ b/inc/lib/Twig/TokenParser/Extends.php
diff --git a/inc/contrib/Twig/TokenParser/Filter.php b/inc/lib/Twig/TokenParser/Filter.php
index 0969ab1e..0969ab1e 100644
--- a/inc/contrib/Twig/TokenParser/Filter.php
+++ b/inc/lib/Twig/TokenParser/Filter.php
diff --git a/inc/contrib/Twig/TokenParser/For.php b/inc/lib/Twig/TokenParser/For.php
index 5ce82979..5ce82979 100644
--- a/inc/contrib/Twig/TokenParser/For.php
+++ b/inc/lib/Twig/TokenParser/For.php
diff --git a/inc/contrib/Twig/TokenParser/From.php b/inc/lib/Twig/TokenParser/From.php
index 87aceb4d..87aceb4d 100644
--- a/inc/contrib/Twig/TokenParser/From.php
+++ b/inc/lib/Twig/TokenParser/From.php
diff --git a/inc/contrib/Twig/TokenParser/If.php b/inc/lib/Twig/TokenParser/If.php
index 65a1a8b2..65a1a8b2 100644
--- a/inc/contrib/Twig/TokenParser/If.php
+++ b/inc/lib/Twig/TokenParser/If.php
diff --git a/inc/contrib/Twig/TokenParser/Import.php b/inc/lib/Twig/TokenParser/Import.php
index d0a88cde..d0a88cde 100644
--- a/inc/contrib/Twig/TokenParser/Import.php
+++ b/inc/lib/Twig/TokenParser/Import.php
diff --git a/inc/contrib/Twig/TokenParser/Include.php b/inc/lib/Twig/TokenParser/Include.php
index 54154559..54154559 100644
--- a/inc/contrib/Twig/TokenParser/Include.php
+++ b/inc/lib/Twig/TokenParser/Include.php
diff --git a/inc/contrib/Twig/TokenParser/Macro.php b/inc/lib/Twig/TokenParser/Macro.php
index da1ac55c..da1ac55c 100644
--- a/inc/contrib/Twig/TokenParser/Macro.php
+++ b/inc/lib/Twig/TokenParser/Macro.php
diff --git a/inc/contrib/Twig/TokenParser/Sandbox.php b/inc/lib/Twig/TokenParser/Sandbox.php
index 62e7f8f7..62e7f8f7 100644
--- a/inc/contrib/Twig/TokenParser/Sandbox.php
+++ b/inc/lib/Twig/TokenParser/Sandbox.php
diff --git a/inc/contrib/Twig/TokenParser/Set.php b/inc/lib/Twig/TokenParser/Set.php
index 489e1d30..489e1d30 100644
--- a/inc/contrib/Twig/TokenParser/Set.php
+++ b/inc/lib/Twig/TokenParser/Set.php
diff --git a/inc/contrib/Twig/TokenParser/Spaceless.php b/inc/lib/Twig/TokenParser/Spaceless.php
index aa7ffbc4..aa7ffbc4 100644
--- a/inc/contrib/Twig/TokenParser/Spaceless.php
+++ b/inc/lib/Twig/TokenParser/Spaceless.php
diff --git a/inc/contrib/Twig/TokenParser/Use.php b/inc/lib/Twig/TokenParser/Use.php
index 16c47e3e..16c47e3e 100644
--- a/inc/contrib/Twig/TokenParser/Use.php
+++ b/inc/lib/Twig/TokenParser/Use.php
diff --git a/inc/contrib/Twig/TokenParserBroker.php b/inc/lib/Twig/TokenParserBroker.php
index 34fcdfbf..34fcdfbf 100644
--- a/inc/contrib/Twig/TokenParserBroker.php
+++ b/inc/lib/Twig/TokenParserBroker.php
diff --git a/inc/contrib/Twig/TokenParserBrokerInterface.php b/inc/lib/Twig/TokenParserBrokerInterface.php
index 3ce8ca26..3ce8ca26 100644
--- a/inc/contrib/Twig/TokenParserBrokerInterface.php
+++ b/inc/lib/Twig/TokenParserBrokerInterface.php
diff --git a/inc/contrib/Twig/TokenParserInterface.php b/inc/lib/Twig/TokenParserInterface.php
index 114a939e..114a939e 100644
--- a/inc/contrib/Twig/TokenParserInterface.php
+++ b/inc/lib/Twig/TokenParserInterface.php
diff --git a/inc/contrib/Twig/TokenStream.php b/inc/lib/Twig/TokenStream.php
index a2002b42..a2002b42 100644
--- a/inc/contrib/Twig/TokenStream.php
+++ b/inc/lib/Twig/TokenStream.php
diff --git a/inc/contrib/gettext/AUTHORS b/inc/lib/gettext/AUTHORS
index da6ade7b..da6ade7b 100644
--- a/inc/contrib/gettext/AUTHORS
+++ b/inc/lib/gettext/AUTHORS
diff --git a/inc/contrib/gettext/COPYING b/inc/lib/gettext/COPYING
index 5b6e7c66..5b6e7c66 100644
--- a/inc/contrib/gettext/COPYING
+++ b/inc/lib/gettext/COPYING
diff --git a/inc/contrib/gettext/Makefile b/inc/lib/gettext/Makefile
index f389de51..f389de51 100644
--- a/inc/contrib/gettext/Makefile
+++ b/inc/lib/gettext/Makefile
diff --git a/inc/contrib/gettext/README b/inc/lib/gettext/README
index bca4f916..bca4f916 100644
--- a/inc/contrib/gettext/README
+++ b/inc/lib/gettext/README
diff --git a/inc/contrib/gettext/examples/index.php b/inc/lib/gettext/examples/index.php
index 263cd3d3..263cd3d3 100644
--- a/inc/contrib/gettext/examples/index.php
+++ b/inc/lib/gettext/examples/index.php
diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
index 91930376..91930376 100644
--- a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
+++ b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.mo
diff --git a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
index 6e4886b5..6e4886b5 100644
--- a/inc/contrib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
+++ b/inc/lib/gettext/examples/locale/de_CH/LC_MESSAGES/messages.po
diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
index 497c8830..497c8830 100644
--- a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
+++ b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo
diff --git a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
index e5da0e94..e5da0e94 100644
--- a/inc/contrib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
+++ b/inc/lib/gettext/examples/locale/sr_CS/LC_MESSAGES/messages.po
diff --git a/inc/contrib/gettext/examples/pigs_dropin.php b/inc/lib/gettext/examples/pigs_dropin.php
index 94fd8507..94fd8507 100644
--- a/inc/contrib/gettext/examples/pigs_dropin.php
+++ b/inc/lib/gettext/examples/pigs_dropin.php
diff --git a/inc/contrib/gettext/examples/pigs_fallback.php b/inc/lib/gettext/examples/pigs_fallback.php
index 353190da..353190da 100644
--- a/inc/contrib/gettext/examples/pigs_fallback.php
+++ b/inc/lib/gettext/examples/pigs_fallback.php
diff --git a/inc/contrib/gettext/examples/update b/inc/lib/gettext/examples/update
index 76b4308a..76b4308a 100755
--- a/inc/contrib/gettext/examples/update
+++ b/inc/lib/gettext/examples/update
diff --git a/inc/contrib/gettext/gettext.inc b/inc/lib/gettext/gettext.inc
index 00b96669..cb21fea5 100644
--- a/inc/contrib/gettext/gettext.inc
+++ b/inc/lib/gettext/gettext.inc
@@ -38,8 +38,8 @@ if (!defined('LC_MESSAGES')) {
   define('LC_MESSAGES',	5);
 }
 
-require('streams.php');
-require('gettext.php');
+require(dirname(__FILE__) . '/streams.php');
+require(dirname(__FILE__) . '/gettext.php');
 
 
 // Variables
diff --git a/inc/contrib/gettext/gettext.php b/inc/lib/gettext/gettext.php
index 5064047c..5064047c 100755
--- a/inc/contrib/gettext/gettext.php
+++ b/inc/lib/gettext/gettext.php
diff --git a/inc/contrib/gettext/streams.php b/inc/lib/gettext/streams.php
index 3cdc1584..3cdc1584 100644
--- a/inc/contrib/gettext/streams.php
+++ b/inc/lib/gettext/streams.php
diff --git a/inc/contrib/gettext/tests/LocalesTest.php b/inc/lib/gettext/tests/LocalesTest.php
index fab21f86..fab21f86 100644
--- a/inc/contrib/gettext/tests/LocalesTest.php
+++ b/inc/lib/gettext/tests/LocalesTest.php
diff --git a/inc/contrib/gettext/tests/ParsingTest.php b/inc/lib/gettext/tests/ParsingTest.php
index ff561989..ff561989 100644
--- a/inc/contrib/gettext/tests/ParsingTest.php
+++ b/inc/lib/gettext/tests/ParsingTest.php
diff --git a/inc/contrib/minify/FirePHP.php b/inc/lib/minify/FirePHP.php
index d301a641..d301a641 100755
--- a/inc/contrib/minify/FirePHP.php
+++ b/inc/lib/minify/FirePHP.php
diff --git a/inc/contrib/minify/HTTP/ConditionalGet.php b/inc/lib/minify/HTTP/ConditionalGet.php
index 93b7e75d..93b7e75d 100755
--- a/inc/contrib/minify/HTTP/ConditionalGet.php
+++ b/inc/lib/minify/HTTP/ConditionalGet.php
diff --git a/inc/contrib/minify/HTTP/Encoder.php b/inc/lib/minify/HTTP/Encoder.php
index 8f347793..8f347793 100755
--- a/inc/contrib/minify/HTTP/Encoder.php
+++ b/inc/lib/minify/HTTP/Encoder.php
diff --git a/inc/contrib/minify/JSMin.php b/inc/lib/minify/JSMin.php
index b6879f37..b6879f37 100755
--- a/inc/contrib/minify/JSMin.php
+++ b/inc/lib/minify/JSMin.php
diff --git a/inc/contrib/minify/JSMinPlus.php b/inc/lib/minify/JSMinPlus.php
index 5a3c5bdf..5a3c5bdf 100755
--- a/inc/contrib/minify/JSMinPlus.php
+++ b/inc/lib/minify/JSMinPlus.php
diff --git a/inc/contrib/minify/Minify.php b/inc/lib/minify/Minify.php
index 9634f221..9634f221 100755
--- a/inc/contrib/minify/Minify.php
+++ b/inc/lib/minify/Minify.php
diff --git a/inc/contrib/minify/Minify/Build.php b/inc/lib/minify/Minify/Build.php
index e625165e..e625165e 100755
--- a/inc/contrib/minify/Minify/Build.php
+++ b/inc/lib/minify/Minify/Build.php
diff --git a/inc/contrib/minify/Minify/CSS.php b/inc/lib/minify/Minify/CSS.php
index 49882e9d..49882e9d 100755
--- a/inc/contrib/minify/Minify/CSS.php
+++ b/inc/lib/minify/Minify/CSS.php
diff --git a/inc/contrib/minify/Minify/CSS/Compressor.php b/inc/lib/minify/Minify/CSS/Compressor.php
index c6cdd8b7..c6cdd8b7 100755
--- a/inc/contrib/minify/Minify/CSS/Compressor.php
+++ b/inc/lib/minify/Minify/CSS/Compressor.php
diff --git a/inc/contrib/minify/Minify/CSS/UriRewriter.php b/inc/lib/minify/Minify/CSS/UriRewriter.php
index 8845f156..8845f156 100755
--- a/inc/contrib/minify/Minify/CSS/UriRewriter.php
+++ b/inc/lib/minify/Minify/CSS/UriRewriter.php
diff --git a/inc/contrib/minify/Minify/Cache/APC.php b/inc/lib/minify/Minify/Cache/APC.php
index 24ab0462..24ab0462 100755
--- a/inc/contrib/minify/Minify/Cache/APC.php
+++ b/inc/lib/minify/Minify/Cache/APC.php
diff --git a/inc/contrib/minify/Minify/Cache/File.php b/inc/lib/minify/Minify/Cache/File.php
index 3fa6b18f..3fa6b18f 100755
--- a/inc/contrib/minify/Minify/Cache/File.php
+++ b/inc/lib/minify/Minify/Cache/File.php
diff --git a/inc/contrib/minify/Minify/Cache/Memcache.php b/inc/lib/minify/Minify/Cache/Memcache.php
index 72bf454b..72bf454b 100755
--- a/inc/contrib/minify/Minify/Cache/Memcache.php
+++ b/inc/lib/minify/Minify/Cache/Memcache.php
diff --git a/inc/contrib/minify/Minify/Cache/ZendPlatform.php b/inc/lib/minify/Minify/Cache/ZendPlatform.php
index 3130d69a..3130d69a 100755
--- a/inc/contrib/minify/Minify/Cache/ZendPlatform.php
+++ b/inc/lib/minify/Minify/Cache/ZendPlatform.php
diff --git a/inc/contrib/minify/Minify/CommentPreserver.php b/inc/lib/minify/Minify/CommentPreserver.php
index 7a359bf9..7a359bf9 100755
--- a/inc/contrib/minify/Minify/CommentPreserver.php
+++ b/inc/lib/minify/Minify/CommentPreserver.php
diff --git a/inc/contrib/minify/Minify/Controller/Base.php b/inc/lib/minify/Minify/Controller/Base.php
index 240b5449..240b5449 100755
--- a/inc/contrib/minify/Minify/Controller/Base.php
+++ b/inc/lib/minify/Minify/Controller/Base.php
diff --git a/inc/contrib/minify/Minify/Controller/Files.php b/inc/lib/minify/Minify/Controller/Files.php
index 83f028ad..83f028ad 100755
--- a/inc/contrib/minify/Minify/Controller/Files.php
+++ b/inc/lib/minify/Minify/Controller/Files.php
diff --git a/inc/contrib/minify/Minify/Controller/Groups.php b/inc/lib/minify/Minify/Controller/Groups.php
index 2d4e43b2..2d4e43b2 100755
--- a/inc/contrib/minify/Minify/Controller/Groups.php
+++ b/inc/lib/minify/Minify/Controller/Groups.php
diff --git a/inc/contrib/minify/Minify/Controller/MinApp.php b/inc/lib/minify/Minify/Controller/MinApp.php
index d47c60d9..d47c60d9 100755
--- a/inc/contrib/minify/Minify/Controller/MinApp.php
+++ b/inc/lib/minify/Minify/Controller/MinApp.php
diff --git a/inc/contrib/minify/Minify/Controller/Page.php b/inc/lib/minify/Minify/Controller/Page.php
index de471e12..de471e12 100755
--- a/inc/contrib/minify/Minify/Controller/Page.php
+++ b/inc/lib/minify/Minify/Controller/Page.php
diff --git a/inc/contrib/minify/Minify/Controller/Version1.php b/inc/lib/minify/Minify/Controller/Version1.php
index 5279d36d..5279d36d 100755
--- a/inc/contrib/minify/Minify/Controller/Version1.php
+++ b/inc/lib/minify/Minify/Controller/Version1.php
diff --git a/inc/contrib/minify/Minify/DebugDetector.php b/inc/lib/minify/Minify/DebugDetector.php
index 1def9748..1def9748 100755
--- a/inc/contrib/minify/Minify/DebugDetector.php
+++ b/inc/lib/minify/Minify/DebugDetector.php
diff --git a/inc/contrib/minify/Minify/HTML.php b/inc/lib/minify/Minify/HTML.php
index e9453ffb..e9453ffb 100755
--- a/inc/contrib/minify/Minify/HTML.php
+++ b/inc/lib/minify/Minify/HTML.php
diff --git a/inc/contrib/minify/Minify/HTML/Helper.php b/inc/lib/minify/Minify/HTML/Helper.php
index 807fdc9c..807fdc9c 100755
--- a/inc/contrib/minify/Minify/HTML/Helper.php
+++ b/inc/lib/minify/Minify/HTML/Helper.php
diff --git a/inc/contrib/minify/Minify/ImportProcessor.php b/inc/lib/minify/Minify/ImportProcessor.php
index bdfae547..bdfae547 100755
--- a/inc/contrib/minify/Minify/ImportProcessor.php
+++ b/inc/lib/minify/Minify/ImportProcessor.php
diff --git a/inc/contrib/minify/Minify/JS/ClosureCompiler.php b/inc/lib/minify/Minify/JS/ClosureCompiler.php
index f4ed5bdb..f4ed5bdb 100755
--- a/inc/contrib/minify/Minify/JS/ClosureCompiler.php
+++ b/inc/lib/minify/Minify/JS/ClosureCompiler.php
diff --git a/inc/contrib/minify/Minify/Lines.php b/inc/lib/minify/Minify/Lines.php
index ca8afa1b..ca8afa1b 100755
--- a/inc/contrib/minify/Minify/Lines.php
+++ b/inc/lib/minify/Minify/Lines.php
diff --git a/inc/contrib/minify/Minify/Logger.php b/inc/lib/minify/Minify/Logger.php
index 8eb72f45..8eb72f45 100755
--- a/inc/contrib/minify/Minify/Logger.php
+++ b/inc/lib/minify/Minify/Logger.php
diff --git a/inc/contrib/minify/Minify/Packer.php b/inc/lib/minify/Minify/Packer.php
index 949c3eef..949c3eef 100755
--- a/inc/contrib/minify/Minify/Packer.php
+++ b/inc/lib/minify/Minify/Packer.php
diff --git a/inc/contrib/minify/Minify/Source.php b/inc/lib/minify/Minify/Source.php
index 5a85d10d..5a85d10d 100755
--- a/inc/contrib/minify/Minify/Source.php
+++ b/inc/lib/minify/Minify/Source.php
diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.java b/inc/lib/minify/Minify/YUI/CssCompressor.java
index 3fb497a9..3fb497a9 100755
--- a/inc/contrib/minify/Minify/YUI/CssCompressor.java
+++ b/inc/lib/minify/Minify/YUI/CssCompressor.java
diff --git a/inc/contrib/minify/Minify/YUI/CssCompressor.php b/inc/lib/minify/Minify/YUI/CssCompressor.php
index ae3443d4..ae3443d4 100755
--- a/inc/contrib/minify/Minify/YUI/CssCompressor.php
+++ b/inc/lib/minify/Minify/YUI/CssCompressor.php
diff --git a/inc/contrib/minify/Minify/YUICompressor.php b/inc/lib/minify/Minify/YUICompressor.php
index c5bd8a1e..c5bd8a1e 100755
--- a/inc/contrib/minify/Minify/YUICompressor.php
+++ b/inc/lib/minify/Minify/YUICompressor.php
diff --git a/inc/contrib/minify/MrClay/Cli.php b/inc/lib/minify/MrClay/Cli.php
index ac201582..ac201582 100755
--- a/inc/contrib/minify/MrClay/Cli.php
+++ b/inc/lib/minify/MrClay/Cli.php
diff --git a/inc/contrib/minify/MrClay/Cli/Arg.php b/inc/lib/minify/MrClay/Cli/Arg.php
index 81146a7f..81146a7f 100755
--- a/inc/contrib/minify/MrClay/Cli/Arg.php
+++ b/inc/lib/minify/MrClay/Cli/Arg.php
diff --git a/inc/contrib/recaptcha/LICENSE b/inc/lib/recaptcha/LICENSE
index b612f71f..b612f71f 100644
--- a/inc/contrib/recaptcha/LICENSE
+++ b/inc/lib/recaptcha/LICENSE
diff --git a/inc/contrib/recaptcha/recaptchalib.php b/inc/lib/recaptcha/recaptchalib.php
index 32c4f4d7..32c4f4d7 100644
--- a/inc/contrib/recaptcha/recaptchalib.php
+++ b/inc/lib/recaptcha/recaptchalib.php
diff --git a/inc/template.php b/inc/template.php
index 537016ac..2a79f918 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -5,7 +5,7 @@
 		exit;

 	}

 	

-	require 'contrib/Twig/Autoloader.php';

+	require 'lib/Twig/Autoloader.php';

 	Twig_Autoloader::register();

 	

 	Twig_Autoloader::autoload('Twig_Extensions_Node_Trans');