assets change (test)
Merge remote-tracking branch 'origin/develop'

Conflicts:
	public/css/style.css
	public/js/app-wdz.js