necessary for sync
Merge branch 'master' of https://github.com/tsadykhov/research-galaxy

Conflicts:
	app/.DS_Store
necessary for sync