Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp

indra/newview/llstartup.cpp

@@ -200,7 +200,6 @@
 #include "llnamelistctrl.h"
 #include "llnamebox.h"
 #include "llnameeditor.h"
-#include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"