enable uberjar java deployment
remove
move port to 5000 for dokku
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project.clj