Removed all javascript-like functionality and syntax. This is Objective C
Merge branch 'master' into objc-conventions