Fixed not found messages
Fixed not found messages
Merge origin/master

Conflicts:
	www/scss/app.scss
Merge origin/master

Conflicts:
	www/scss/app.scss