add grunt task for deploying application on second production server
resolve merge conflicts