Commiting merged changes, which I can't edit the tree without. :S
Merge branch 'master' of github.com:zardoru/raindrop

Conflicts:
	GameData/Skins/default/screengameplay7k.lua
Merge branch 'master' of github.com:zardoru/raindrop

Conflicts:
	config.lua
Merge branch 'master' of github.com:zardoru/raindrop
Merge branch 'master' of github.com:zardoru/raindrop

Conflicts:
	src/ScreenGameplay7K_Setup.cpp
Put the pacemaker back where it's supposed to be.