gulp + browserify
Merge branch 'master' of https://github.com/adei-kit/sd-katrin

Conflicts:
	.gitignore