Merge branch 'mas_application'

Conflicts:
	run_tests.sh
	src/skel/mas_skel.erl