Added wolfram alpha support.
merge conflict fixed
javadocs
javadocs
set right resolutions for wolfram logo
Set the right color for the Wolfram|Alpha icon

Signed-off-by: Mark Kamsma <mark@markkamsma.nl>