merging
Merge branch 'master' of https://github.com/QuantumHive/WebSerbah.git

Conflicts:
	scripts/autogen.js [Resolved]
Merge branch 'master' of https://github.com/QuantumHive/WebSerbah.git