before going to kids
Merge branch 'master' of https://github.com/lhasnawi/proposal after fix

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/queueinglib.1410667778783.pdom

.metadata/.plugins/org.eclipse.core.resources/.history/32/f0f81ae19a4900
1412ddd2d3a038f04f

.metadata/.plugins/org.eclipse.core.resources/.history/a/f0b41f669b49001
412ddd2d3a038f04f

.metadata/.plugins/org.eclipse.core.resources/.projects/queueinglib/.ind
exes/history.index

.metadata/.plugins/org.eclipse.core.resources/.projects/queueinglib/.mar
kers

.metadata/.plugins/org.eclipse.core.resources/.projects/queuenet/.indexe
s/history.index
	.metadata/.plugins/org.eclipse.core.resources/.root/18.tree

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.x
ml
	queueinglib/P3DModuleDB.h
	queueinglib/SSController.cc