Minor js fix
Merge remote-tracking branch 'origin/Development'
Merge branch 'master' of https://github.com/splintercode/CoreElements