Merge
Fixed a bug in Shot.js, renamed home controller.