changed infowindow edit buttons + added edit-row new one
conflict solved + css problems with Firefox fixed
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop