First commit
add images
fix splash page display
fix bootstrap js
fix merge conflict
fix merge conflict