Fixing merge conflicts.
Fixing merge conflicts.

muyehub/lithium,datachand/lithium,graphis/lithium,UnionOfRAD/lithium,m4rcsch/lithium-core-library,jails/lithium,SensCritique/lithium,pixelcog/lithium,davidpersson/lithium,mehlah/lithium,qoqa/lithium,qoqa/lithium,mehlah/lithium,datachand/lithium,SensCritique/lithium,whowgames/lithium,davidpersson/lithium,jails/lithium,UnionOfRAD/framework,whowgames/lithium,m4rcsch/lithium-core-library,muyehub/lithium,wbeater/lithium,pixelcog/lithium,graphis/lithium,wbeater/lithium,m4rcsch/li3_framework,UnionOfRAD/lithium