Mergeupneo4jdesktop

need to look at licensing, otherwise i think it is good to go