FS login
Merge branch 'develop' into fs-login

Conflicts:
	UltimateGenSearch/App_Start/DependencyConfig.cs
Merge pull request #42 from palmerhyde/fs-login

Fs login