Many reworks and additions
Merge branch 'master' of https://github.com/mjoell/QuikSnap

Conflicts:
	.gitignore