add controllers, need to fix redirect
Merge origin/master