fix toolbar shortcuts
fix toolbar shortcuts

Conflicts:

	src/qt/bitcoingui.cpp

thunderrabbit/clams,nochowderforyou/clams,Kefkius/clams,robvanmieghem/clams,Jheguy2/Mercury,thunderrabbit/clams,Kefkius/clams,Kefkius/clams,thunderrabbit/clams,robvanmieghem/clams,robvanmieghem/clams,nochowderforyou/clams,Jheguy2/Mercury,Jheguy2/Mercury,thunderrabbit/clams,nochowderforyou/clams,dooglus/clams,Jheguy2/Mercury,Kefkius/clams,robvanmieghem/clams,Jheguy2/Mercury,thunderrabbit/clams,robvanmieghem/clams,dooglus/clams,dooglus/clams,Kefkius/clams,nochowderforyou/clams,dooglus/clams,nochowderforyou/clams,dooglus/clams