Added grunt server proxy support
Merge branch 'feature/proxy-support'