Fixed some merge issues (now it's working properly)
Added test case for IK
Merge branch 'master' into scissorrenderstate