Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/sample_app.iml