please get profiledialog.java, nick
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Finished profile dialog