Merge branch 'master' into administration

build-android.sh

build-ios.sh

build.sh

client/routes/router.coffee

client/stylesheets/base.less

client/views/app/room.coffee

client/views/app/sportlight/mobileMessageMenu.coffee

client/views/app/sportlight/mobileMessageMenu.html

client/views/cmsPage.coffee

client/views/cmsPage.html

client/views/login/form.html

client/views/login/intro.html

client/views/main.html

packages/rocketchat-lib/settings/server/startup.coffee

publish_packages.sh

server/lib/collections.coffee

server/methods/cmsPage.coffee

server/methods/reportMessage.coffee