Update README.md
Merge commit '197c4ebf357b99fc489718bfb943fe2b44d97895' into dev

Conflicts:
	app/README.md