Merge pull request #2471 from pods-framework/feature/2.x-optimizations

Pods 2.5 optimizations work
Pods 2.5 Beta 1
Merge branch '2.x' of github.com:pods-framework/pods into 2.x

Conflicts:
	init.php
Merge branch '2.x' into feature/2.x-optimizations