merged develop into master

removed temp files