minor changes
Update SBT version to 0.12.0
Merge branch 'wip-merge' into wip-delite-develop