Moved public dir into app; added server-side tests for Controller
Merged from master