add links
fix controller and links
add links
fix conflict
Merge remote-tracking branch 'origin/dev' into dev