Changed iOS nav button color
Merge remote-tracking branch 'upstream/master' into goat
Login layout fix, dev mode in Welcome for Uploader Android fix
Merge remote-tracking branch 'upstream/master' into goat
Merge pull request #960 from stowellm/goat

uploader ios nav bar, login dialog fix android, dev-mode fix android