Fresh Scala project from @hseeberger's template 20130823
Initial state
Initial commit.
Resolved conflict.