Merge common changes from Ang-Rails