Conflicts resolved
Merge branch 'master' of https://github.com/sheetal-jain/apt-parent
Internationalization