assets submodule updated
minor fixes in scss, logs now ignored in git
Merge branch 'develop' into CN-26

Conflicts:
	app/styles/style.scss