Porting keyword dialog to keyword activity (needs cleanup and some minor
issue fixes)
Merge branch 'master' of https://github.com/celloman/GREPapp.git