Merge pull request #21 from mancdaz/master

Merged automatically by jenkins after successful build test
Merge pull request #22 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
End of sprint version bump.
End of sprint version bump.
End of sprint version bump.
End of sprint version bump.
rewrite to use ip-location library lookups