front end updated
merge conflict
dos to unix
rebuild tree view
Merge branch 'andreqi-master'
fixed