adding merge button
added merge method to model, merge button and merge dialog added to index html
Merge branch 'master' into merging
merging method complete
updating ui after merge without refresh added
Merge branch 'avaneesh' - adding version to prevent stale cache
merge dialog,error handling,max id code
Merge branch 'master' into merging
Merge branch 'avaneesh'
Merge branch 'merging' - Adds copy/merge problem feature.
Merge branch 'master' into avaneesh

erging master into avaneesh