revert to port 8080
Merge branch 'master' into selfie

Conflicts:
	app/src/main/java/com/singlestoneconsulting/web/ApiController.java