10.10.2013 4:04pm - new button in the chart vis setting activity
before vis btn merge
Merge remote-tracking branch 'choose_remote_name/master' into
yury_continued_integration

Conflicts:
	bin/EnvisPrototype.apk
	bin/classes.dex
	bin/classes/com/envisprototype/R$id.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$1.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$2.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$3.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$4.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$5.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$6.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$7.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$8.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity$9.class
	bin/classes/com/envisprototype/view/ChartVisualizationSettingsActivity.class
	bin/classes/com/envisprototype/view/MainActivity.class
	bin/classes/com/envisprototype/view/MapInfoViewActivity.class
	bin/classes/com/envisprototype/view/SensorInfoViewActivity.class
	bin/classes/com/envisprototype/view/SetInfoViewActivity.class
	bin/classes/com/envisprototype/view/ThreeDVisualisation.class
	bin/classes/com/envisprototype/view/model/Set_SensorListAdapter.class
	bin/resources.ap_
	gen/com/envisprototype/R.java
	res/layout/activity_chart_visualization_settings.xml
	src/com/envisprototype/view/ChartVisualizationSettingsActivity.java