Added tip
Updated text, and changed format of tip ? -> :
Merge branch 'master' into api-1.1

Conflicts:
	library.json