gros clean
Merge branch 'master' of github.com:Ghostofpq/SeltyrTactical

Conflicts:
	entities/entities.iml
	entities/pom.xml
	entities/src/main/java/com/ghostofpq/seltyrtactical/entities/job/JobType.java