Data roaming charges to end in EU within two years