scala and something else
Merged branch 'master' of https://github.com/netzbasis/braincrack

Conflicts: RESOLVED
	shell/playground/dialog_examples.sh