template changes. Remove server part. Fixed grunt serve/testing