changed to java 8
added javaFX project
fixed test fileMerger for java8
work on adding gui
Merge branch 'fJava8' into fLoginGui
gui starting up
Merge branch 'fLoginGui' of https://github.com/vauvenal5/pieShare into fLoginGui
minor bug fixes
mainController + connection between javaFX and spring
changed assembly plugin
changed context locations
fixed netbeans actions
Merge branch 'fChangedPlugin' into development
Merge branch 'development' into fLoginGui
Merge branch 'fLoginGui' into development