add links
fix controller and links
add links
fix conflict
Merge branch 'dev' into homepage_new
Update development.yml.example
Merge remote-tracking branch 'origin/dev' into dev
Merge pull request #16 from is-valid/homepage_new

add links
Merge branch 'dev' into 624_N