updated state
Merge branch 'master' of https://github.com/djtyree/drcrest.git

Conflicts:
	src/main/java/com/tigerstripestech/jersey/db/schedule/ScheduleDb.java