|  | 510cb9c295 | Merge remote-tracking branch 'origin/3.0' into 3.0 Conflicts:
	QuickLaunch/settings.properties | 2019-04-28 11:31:44 +02:00 |  | 
			
				
					|  | 1c61ff5219 | bla | 2019-04-28 11:27:33 +02:00 |  | 
			
				
					|  | 02e63e14c0 | Improved Backend | 2019-04-28 11:19:53 +02:00 |  | 
			
				
					|  | c4ed32689d | Changed Server to new protocol on port 9999 with only one String based communication exchange | 2019-04-15 11:14:06 +02:00 |  | 
			
				
					|  | 141374eee3 | Simplified and changed updated process to be more versatile and flexible | 2019-04-15 10:20:43 +02:00 |  | 
			
				
					|  | 3c9ef9c987 | Updated to 3.0 and created new Branch | 2019-04-14 17:55:10 +02:00 |  | 
			
				
					|  | 345676c425 | Removed unused import and recreated some binaries | 2019-04-14 13:26:15 +02:00 |  | 
			
				
					|  | e1c1b51c90 | Initial git commit | 2019-04-14 12:18:58 +02:00 |  |