update to framework
removed off unnecessary if checks
Merge branch 'master' of github.com:Glidias/Kilogaiajax