let other components know when user needs to accept T&C
(Issue 3396) lhnav share popup now has smaller width
(Issue 3396) Only shrink share popup for 480px or less
(Issue 3388) Always collapse the compressed lhnav when a menu item is selected
(Issue 3388) Fix outdated comment
master and tenant google analytics
ignore tenant tracking if same id as master
(Release 4.2.1) Bump version
Merge pull request #3409 from sathomas/termsandconditions

Terms and conditions doesn't indicate re-accepting is required
Travis CI: Fetch nginx ppa from launchpad, use hosts addon
Remove nginx ppa from Travis file
Merge pull request #3544 from bp323/travisFix

Fix travis build
Point Travis to irc.freenode.org#oae
Synchronized translations
Merge branch 'master' of https://github.com/oaeproject/3akai-ux
Use -y flag with add-apt-repository
Merge pull request #3545 from bp323/fixtravis

Use -y flag with add-apt-repository
Merge branch 'master' into bootstrap3

Conflicts:
	ui/bundles/es_ES.properties
Merge branch 'issue-3396' of https://github.com/bp323/3akai-ux into issue-3396
Merge branch 'issue-3388' of https://github.com/bp323/3akai-ux into issue-3388