controller creation ways
Merge remote-tracking branch 'origin/master'