Merge branch 'troops'

* troops:
  grunt
fixed domhandler target country bug
Merge branch 'master' into refactor

* master:
fixed merge conflict in domhandler
refactored
reduced image size and created redirection for index