Add grunt_git_log_json
Merge conflicts