initial commit of scripting engine final changes
Merge branch 'master' of https://github.com/deanhiller/databus

Conflicts:
	webapp/conf/application.conf