Fixed creds; changed java version of meteor-clients to 1.6
Merge remote-tracking branch 'AHeise/master'