Merge branch 'dev'

Update version to 2.0.0

Update docs & default config for view

Version 1.6.0 stable

Update version - beta3

Fix candy-chat#208 nick assignment

Thanks @PaulSD for the PR. I made minor changes to the commit,
hope you don't mind :)

Fix caps node to be candy url & reset submodule for strophe to be on …

…the standard strophe.js version

Merge branch 'dev'

Bundle.