Merge branch 'release/3.2'
Fixed JIRA URI.
Merge branch 'master' of https://github.com/joola/joola.io
Merge pull request #12 from shift/master

JIRA README URL incorrect
add waffle.io badge
Merge pull request #77 from waffleio/master

waffle.io Badge
Merge branch 'refs/heads/develop'

Conflicts:
	README.md
#348 Disabled crunch
- Added crunch config switch, it's now optional
Merge pull request #351 from joola/feature/#348

#348 Disabled crunch on demo
Merge pull request #362 from joola/master

rebase master on develop