some v-boxing
Merge branch 'develop' of https://github.com/gao-artur/SnoringAnalysis into gao_FiatureExtraction

Conflicts:
	SnoringAnalysis/.classpath
	SnoringAnalysis/src/app/App.java
	SnoringAnalysis/src/audioProcessors/EnergyProcessors/EnergyDispatcher.java