Add merge with form
Include database in gitignore file
only show form to admin
simple merge
Remove admin check
Allow edition only to current user
Merge articles with comments
Fix add/edit categories