swq
Merge branch 'master' of github.com:rkophs/ideserver

Conflicts:
	configure.js
stuff