Merge remote-tracking branch 'origin/Jason'
Merge remote-tracking branch 'origin/master'
Almende logo import