commit from giteye
Merge branch 'master' of https://r-uu@github.com/r-uu/skiller.git

Conflicts:
	eclipse/4.4/.metadata/.log
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.projects/skiller-client/org.eclipse.jdt.core/state.dat
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.projects/skiller-server-ejb/org.eclipse.jdt.core/state.dat
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.projects/skiller-server-war/org.eclipse.jdt.core/state.dat
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.projects/skiller-server-war/org.eclipse.wst.jsdt.core/state.dat
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	eclipse/4.4/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse/4.4/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	eclipse/4.4/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	eclipse/4.4/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	eclipse/4.4/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	eclipse/4.4/.metadata/.plugins/org.eclipse.wst.server.core/publish/publish0.dat
	eclipse/4.4/.metadata/.plugins/org.eclipse.wst.server.core/tmp0/publish.txt
	eclipse/4.4/.metadata/version.ini