first build of Scalatra App
fixed merges