Fix "conservation" and move Ratchet\Tutorial to somewhere better looking
Merge branch 'master' into conversation_typo_and_no_tutorials

Conflicts:
	js/main.js
Merge pull request #6 from owncloud/conversation_typo_and_no_tutorials

Fix "conservation" and move Ratchet\Tutorial to somewhere better looking