require js integration
merge from master: require js integration