fixed conflicting id
Merge branch 'master' of https://github.com/pciang/GrantIt