Added comment
Merge commit '533f590cb32c082675ef4c36e3bc66fefb4fc005'

Conflicts:
	common/common-server/common-server.js
Added more text
Merge pull request #1 from sacarro/some-feature-2

Some feature 2