p
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/style-tools/eventRipple.js
	app/src/views/appView.js
	app/src/views/menuView.js