japp
Merge branch 'master' of https://github.com/MichaelSjostrom/SpectrumTest

Conflicts:
	FFTBasedSpectrumAnalyzer-master/bin/SpectrumAnalyzer.apk
	FFTBasedSpectrumAnalyzer-master/bin/classes.dex
	FFTBasedSpectrumAnalyzer-master/bin/classes/com/somitsolutions/android/spectrumanalyzer/SoundRecordAndAnalysisActivity$FreqView.class
	FFTBasedSpectrumAnalyzer-master/bin/classes/com/somitsolutions/android/spectrumanalyzer/SoundRecordAndAnalysisActivity$MyImageView.class
	FFTBasedSpectrumAnalyzer-master/bin/classes/com/somitsolutions/android/spectrumanalyzer/SoundRecordAndAnalysisActivity$ResetButton$1.class
	FFTBasedSpectrumAnalyzer-master/bin/classes/com/somitsolutions/android/spectrumanalyzer/SoundRecordAndAnalysisActivity$ResetButton.class
	FFTBasedSpectrumAnalyzer-master/bin/classes/com/somitsolutions/android/spectrumanalyzer/SoundRecordAndAnalysisActivity.class