Merge branch 'master' into develop

Conflicts:
	.gitignore
	Gruntfile.js
	ibm-biginsights-ui.iml