Fixed swig template engine
Integrated controllers and routes into the call of the server side index.html.
Merge remote-tracking branch 'origin/master'