Merge branch 'master' of C:\Tools\IntellijProjects\pilotapi with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added Equals methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/rms/pilotapi/test/PersonResourceTest.java
Added resource tests