changes made by grunt task as a result of four merges done yesterday (4/25)