Upgrade to Bootstrap 3.2.0
Bump patch versions
Merge branch 'master' into upgrade-bootstrap

Conflicts:
	package.json
Upgrade aloha
Merge pull request #594 from Connexions/upgrade-bootstrap

Upgrade bootstrap to version 3.2