Reactive git repo.
Merge branch 'master' of https://github.com/nonameplum/appFx-gradle

Conflicts:
	.gitignore
	build.gradle
	database.db
	src/main/java/appFx/Main.java
	src/main/java/appFx/controllers/Controller.java
	src/main/java/appFx/controllers/OrmLiteController.java