adding .gitattributes to specify proper line ending format
upload Analyzer for 2.1 release
adding ARODataCollector for 2.1 release
Updated README.md file for ARO 2.1
Updated README.md file for ARO 2.1
Java coding standards
Merge remote-tracking branch 'upstream/master'

Conflicts:
	ARODataAnalyzer/src/com/att/aro/main/ApplicationResourceOptimizer.java
	ARODataAnalyzer/src/com/att/aro/main/DatacollectorBridge.java
	ARODataAnalyzer/src/com/att/aro/main/DateTraceAppDetailPanel.java
	ARODataAnalyzer/src/com/att/aro/main/FilterApplicationsTableModel.java
	ARODataAnalyzer/src/com/att/aro/main/TCPFlowsTableModel.java
	ARODataAnalyzer/src/com/att/aro/main/WaterFallPanel.java
	ARODataAnalyzer/src/com/att/aro/main/menu/view/ChartPlotOptionsDialog.java
	ARODataAnalyzer/src/com/att/aro/model/BurstCollectionAnalysis.java
	ARODataAnalyzer/src/com/att/aro/model/HttpRequestResponseInfo.java
	ARODataAnalyzer/src/com/att/aro/model/TCPSession.java
	ARODataAnalyzer/src/com/att/aro/model/TraceData.java
	ARODataCollector/src/com/att/android/arodatacollector/activities/AROCollectorCompletedActivity.java
	ARODataCollector/src/com/att/android/arodatacollector/activities/AROCollectorHomeActivity.java
	ARODataCollector/src/com/att/android/arodatacollector/activities/AROCollectorLegalTermsActivity.java
	ARODataCollector/src/com/att/android/arodatacollector/activities/AROCollectorTaskManagerActivity.java
	ARODataCollector/src/com/att/android/arodatacollector/main/AROCollectorTraceService.java
	ARODataCollector/src/com/att/android/arodatacollector/main/ARODataCollector.java