Merge branch 'emas_application'

Conflicts:
	run_tests.sh
	src/mas/skel/skel_main.erl
	test/random_one_pre_process_SUITE.erl