Test for files
Merge branch 'master' of ssh://github.com/genomizer/genomizer-web

Conflicts:
	app/js/models/Annotation.js