bb
dd
Jkjk
jtreMerge branch 'masterV2'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/JavaFx/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/JavaFx/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Velocity/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Velocity/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/hibernate/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/hibernate/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/postgres/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/postgres/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-bl.test/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-bl.test/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-bl/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-bl/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-dal/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-dal/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-view/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/puppet-view/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/106.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/107.tree
	.metadata/.plugins/org.eclipse.core.resources/.root/108.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/202669886.index
	.metadata/.plugins/org.eclipse.jdt.core/2154158531.index
	.metadata/.plugins/org.eclipse.jdt.core/61420328.index
	.metadata/.plugins/org.eclipse.jdt.core/944803827.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
	.metadata/.plugins/org.eclipse.pde.core/-12193050162.workspace/.state
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.7
	.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.8
still having troubles with mering