Implement custom ActionMapper
Add ip location capability
Do some refactoring
Merge remote-tracking branch 'origin/develop' into develop