updating printing conf and labs deployment
Merge branch 'next-release' of github.com:Ecotrust/marco-portal into next-release
moving, servername
Merge remote-tracking branch 'origin/next-release' into mobile