---setup commit---
Merge branch 'master' of https://github.com/zalasus/scales

Conflicts:
	Scales/.cproject
	Scales/.project
setup #2