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
removed default bundle type, added filter facility by receiving or sending facility
made bundle type optional
removed optional sending facility option
rebasing and merging conflicts
removed empty selection
added condition for facility field selection
Merge pull request #56 from freefony/refactor/create-consistent-look

Refactor/create consistent look
Merge pull request #58 from musamusa/bug/fix-bundle-type-filter

Bug/fix bundle type filter
added cce aggregate logic
resolved ccie  before loading controller
added aggregate table
Merge pull request #59 from musamusa/refactor/hide-empty-cce-aggregate-column

Refactor/hide empty cce aggregate column