changing indetation
Merge branch 'martin_merge'
changed indentation
removed white space from ends of lines
removed empty lines from end of files
*_aut_op: formatting