Merge branch 'kyle'
added warning if the user has no/invalid api key
UI fixes from user testing session.
Merge branch 'master' into kyle

Conflicts:
	sendwithus.php