What eric was working on before merging in unifydb
Merge branch 'master' into frontend

Conflicts:
	SongHaven/SongHaven/Controllers/HomeController.cs
Merge branch 'unifydb'