initial commit with scalatra
merge original