cleaning
fedview - edit btn change place
clean
Merge branch 'develop' into 1.x-stable