purge billingrestore
Merge branch 'master' of github.com:PossibleWhale/Sheared
Merge branch 'master' of github.com:PossibleWhale/Sheared

Conflicts:
	Makefile
Merge branch 'master' of github.com:PossibleWhale/Sheared
fix bind() around restoreButton handler
Merge branch 'master' of github.com:PossibleWhale/Sheared
positioning restore button
Merge branch 'master' of github.com:PossibleWhale/Sheared
Merge branch 'master' of github.com:PossibleWhale/Sheared
Merge branch 'master' of github.com:PossibleWhale/Sheared
Merge branch 'master' of github.com:PossibleWhale/Sheared
Merge branch 'master' of github.com:PossibleWhale/Sheared