Solved Merge Conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/obacht/Generator.js