fix templates for api (introduce uniform setter again)
Merge commit '63d97dc'

Conflicts:
	CMakeLists.txt