6.0 build
Merge branch 'dev'

Conflicts:
	application/info/build.json