Using splash image we own
Merge branch 'master' of https://github.com/Eduki/eduki into edit-buttons
made fixes for merge, ready to go