[Saucy] aligned version information
[Saucy/Trusty] version bumps and version information corrections
Merge branch 'master' of https://github.com/shiznix/unity-gentoo

Conflicts:
	dev-libs/libtimezonemap/Manifest