lomio
Merge branch 'develop' of https://github.com/Pablo1990/BioinfoTeam into develop

Conflicts:
	app/alloy.js