input
Merge branch 'master' of github.com:pidgeonproject/pidgeon

Conflicts:
	Core/Config_Core.cs
Merge branch 'master' of github.com:pidgeonproject/pidgeon