Merge remote-tracking branch 'centralapp/develop' into refactor/change-vvm-values-to-variables

Conflicts:
	app/views/bundles/partials/bundle-line.html
Merge remote-tracking branch 'upstream/develop' into refactor/create-consistent-look
rebasing and merging conflicts
Merge pull request #56 from freefony/refactor/create-consistent-look

Refactor/create consistent look