Updates
Merge branch 'master' of https://github.com/getkickbak/KICKBAK into V2.0.0

Conflicts:
	.gitignore
Merge branch 'V2.0.0' of https://github.com/getkickbak/KICKBAK into V2.0.0