login
merging
Merge branch 'master' of github.com:huggle/huggle

Conflicts:
	huggle3/Forms/HuggleForm.cs
	huggle3/Forms/Login.cs
	huggle3/Program.cs
	huggle3/gtk-gui/generated.cs
	huggle3/gtk-gui/huggle3.Forms.About.cs
	huggle3/gtk-gui/huggle3.Forms.LoginForm.cs
Merge branch 'master' of github.com:huggle/huggle