work on the server side parser
Merge branch 'master' of https://github.com/brainling/combobuilder

Conflicts:
	.idea/combobuilder.iml
	.idea/workspace.xml
Merge branch 'master' of https://github.com/brainling/combobuilder

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	.idea/combobuilder.iml
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
removed more idea files