add links
fix conflict
Merge branch 'dev' into homepage_new