JDV6.0
Merge branch 'master' of github.com:s3su/Vlothie-dev-front

Conflicts:
	app/styles/index.tss