Change alert to confirm to be able to save after javascript alert.

#226
Merge origin/master