Signed-off-by: Julius Lehmann <julius@julius-Linux-Portable.(none)>
Merge branch 'edit' of https://github.com/lehmanju/ButtonPermission into edit

Conflicts:
	.gitignore