Updated changelog with v1_0_4 info.
Stage next development version.
Rebase to non-broken master version.

Conflicts:
	gswitch.py