Merge pull request #2 from jsilvestre/master

Fixed: documentation deletion process
multi-doctypes (not ok for now)
resolve conflict
Fixed merged brunch