Added ability to merge observation fields.
Added topnav macro for the wiki.
Merge remote-tracking branch 'upstream/master'
Merge pull request #267 from calonso-conabio/master

assessment translations
more translations
Merge remote-tracking branch 'upstream/master'