Moved main.as to the HomeController to separate concerns
Merge remote-tracking branch 'origin/master'