fixing build command
fix server merge
grunt tests now fail grunt when tests fail