spectrum analyser
Merge branch 'master' of https://github.com/szupie/TIDBF

Conflicts:
	app/js/common.js