Merge branch 'webinterface' of github.com:ninharp/ninbot into webinterface

Conflicts:
	VERSION
	version.sh
Merge branch 'webinterface' of github.com:ninharp/ninbot into webinterface

Conflicts:
	VERSION