remove assets
Merge branch 'dev-root'

Conflicts:
	.gitignore
Merge branch 'dev-root'
ignore deploy folder