version number
Merge branch 'master' of https://github.com/Q42/TrelloScrum

Conflicts:
	manifest.json