Start fixing for new version of Base
Merge
Merge branch 'master' of https://github.com/stayradiated/invoicer

Conflicts:
	.gitignore