Merge branch 'dev' into homepage_new
Merge pull request #16 from is-valid/homepage_new

add links