add draggable dimensions to export tab
jiraId: MAR-6208 , add stripe to the bar chart
Merge branch 'develop' into scenario_result

Conflicts:
	ThreeSixtyOneView/app/scripts/directives/d3/line_chart.js
	ThreeSixtyOneView/app/views/scenario.tpl.html
Merge branch 'develop' of ssh://git.marketshare.com:7999/des/ms360uiux into txixang/import_export

Conflicts:
	ThreeSixtyOneView/app/index.html
	ThreeSixtyOneView/app/scripts/configuration/routes_configuration.js
	ThreeSixtyOneView/app/views/scenario.tpl.html
jiraId: MAR-6208 , clean up data binding
make the popup menu directive
Merge branch 'prototype' into scenario_result

Conflicts:
	ThreeSixtyOneView/app/index.html
jiraId: MAR-6208 , fix dropdown text rendering, make bar chart responsive
jiraId: MAR-6208 , add color and padding to xaxis ticks
make draggable dimension directive
jiraId: MAR-6208 , clean up chart data structure , refactory ng-repeat
jiraId:MAR-6136 add filters related REST calls to pivot table builder
jiraId: MAR-6208 , add tooltip to the chart , cleanup code
Merge branch 'develop' into scenario_result
jiraId:MAR-6136 merge against develop
Merge branch 'develop' of ssh://git.marketshare.com:7999/des/ms360uiux into txixang/import_export

Conflicts:
	ThreeSixtyOneView/app/scripts/controllers/pivotbuilder.js
	ThreeSixtyOneView/app/styles/scss/pivot_table_builder.scss
	ThreeSixtyOneView/app/views/includes/pivot_table_builder.tpl.html
jiraId: MAR-6208 , wrap text when labels are too long , test one and more series of bar charts
Merge branch 'develop' of ssh://git.marketshare.com:7999/des/ms360uiux into txixang/import_export

Conflicts:
	ThreeSixtyOneView/app/scripts/controllers/pivotbuilder.js
	ThreeSixtyOneView/app/views/includes/pivot_table_builder.tpl.html
fix export view
jiraId:MAR-6136 fix minor errors and remove unused directives