let other components know when user needs to accept T&C
(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
Merge branch 'master' into bootstrap3

Conflicts:
	ui/bundles/es_ES.properties